From e4fa6e9cc7f894a5a85ca50249b1f6e9efd49d3a Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 2 Feb 2016 22:39:15 -0800 Subject: [PATCH] Expose ftello64. Also add the missing test that would have caught this. Bug: http://b/24807045 Change-Id: I756a4d825595b52396b15898e3f717156fd1ba2f --- libc/libc.arm.brillo.map | 1 + libc/libc.arm.map | 1 + libc/libc.arm64.map | 1 + libc/libc.map.txt | 1 + libc/libc.mips.brillo.map | 1 + libc/libc.mips.map | 1 + libc/libc.mips64.map | 1 + libc/libc.x86.brillo.map | 1 + libc/libc.x86.map | 1 + libc/libc.x86_64.map | 1 + tests/stdio_test.cpp | 1 + 11 files changed, 11 insertions(+) diff --git a/libc/libc.arm.brillo.map b/libc/libc.arm.brillo.map index 2a1c2de96..84cd9d1c2 100644 --- a/libc/libc.arm.brillo.map +++ b/libc/libc.arm.brillo.map @@ -1229,6 +1229,7 @@ LIBC_N { freeifaddrs; fseeko64; fsetpos64; + ftello64; funopen64; getgrgid_r; getgrnam_r; diff --git a/libc/libc.arm.map b/libc/libc.arm.map index 02dd58cae..001476e8c 100644 --- a/libc/libc.arm.map +++ b/libc/libc.arm.map @@ -1229,6 +1229,7 @@ LIBC_N { freeifaddrs; fseeko64; fsetpos64; + ftello64; funopen64; getgrgid_r; getgrnam_r; diff --git a/libc/libc.arm64.map b/libc/libc.arm64.map index 0f5f1e86f..14f90ad48 100644 --- a/libc/libc.arm64.map +++ b/libc/libc.arm64.map @@ -1152,6 +1152,7 @@ LIBC_N { freeifaddrs; fseeko64; fsetpos64; + ftello64; funopen64; getgrgid_r; getgrnam_r; diff --git a/libc/libc.map.txt b/libc/libc.map.txt index 3a8f7d759..e2aede554 100644 --- a/libc/libc.map.txt +++ b/libc/libc.map.txt @@ -1255,6 +1255,7 @@ LIBC_N { freeifaddrs; fseeko64; fsetpos64; + ftello64; funopen64; getgrgid_r; getgrnam_r; diff --git a/libc/libc.mips.brillo.map b/libc/libc.mips.brillo.map index 100b78e07..ee33d0e92 100644 --- a/libc/libc.mips.brillo.map +++ b/libc/libc.mips.brillo.map @@ -1213,6 +1213,7 @@ LIBC_N { freeifaddrs; fseeko64; fsetpos64; + ftello64; funopen64; getgrgid_r; getgrnam_r; diff --git a/libc/libc.mips.map b/libc/libc.mips.map index 0a92e1e78..c65846044 100644 --- a/libc/libc.mips.map +++ b/libc/libc.mips.map @@ -1213,6 +1213,7 @@ LIBC_N { freeifaddrs; fseeko64; fsetpos64; + ftello64; funopen64; getgrgid_r; getgrnam_r; diff --git a/libc/libc.mips64.map b/libc/libc.mips64.map index 0f5f1e86f..14f90ad48 100644 --- a/libc/libc.mips64.map +++ b/libc/libc.mips64.map @@ -1152,6 +1152,7 @@ LIBC_N { freeifaddrs; fseeko64; fsetpos64; + ftello64; funopen64; getgrgid_r; getgrnam_r; diff --git a/libc/libc.x86.brillo.map b/libc/libc.x86.brillo.map index db328cf0d..a72fa61cd 100644 --- a/libc/libc.x86.brillo.map +++ b/libc/libc.x86.brillo.map @@ -1212,6 +1212,7 @@ LIBC_N { freeifaddrs; fseeko64; fsetpos64; + ftello64; funopen64; getgrgid_r; getgrnam_r; diff --git a/libc/libc.x86.map b/libc/libc.x86.map index f3c6e5926..5a7a5047a 100644 --- a/libc/libc.x86.map +++ b/libc/libc.x86.map @@ -1212,6 +1212,7 @@ LIBC_N { freeifaddrs; fseeko64; fsetpos64; + ftello64; funopen64; getgrgid_r; getgrnam_r; diff --git a/libc/libc.x86_64.map b/libc/libc.x86_64.map index 0f5f1e86f..14f90ad48 100644 --- a/libc/libc.x86_64.map +++ b/libc/libc.x86_64.map @@ -1152,6 +1152,7 @@ LIBC_N { freeifaddrs; fseeko64; fsetpos64; + ftello64; funopen64; getgrgid_r; getgrnam_r; diff --git a/tests/stdio_test.cpp b/tests/stdio_test.cpp index b6f652688..0d21dec57 100644 --- a/tests/stdio_test.cpp +++ b/tests/stdio_test.cpp @@ -1165,6 +1165,7 @@ TEST(STDIO_TEST, lots_of_concurrent_files) { static void AssertFileOffsetAt(FILE* fp, off64_t offset) { EXPECT_EQ(offset, ftell(fp)); EXPECT_EQ(offset, ftello(fp)); + EXPECT_EQ(offset, ftello64(fp)); fpos_t pos; fpos64_t pos64; EXPECT_EQ(0, fgetpos(fp, &pos));