From: Yabin Cui <yabinc@google.com>
Date: Sat, 7 Nov 2015 00:13:47 +0000 (-0800)
Subject: Add fileno_unlocked to support thread sanitizer.
X-Git-Tag: android-x86-7.1-r1~362^2~13^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fb994f4c040da968b7271860535f07daba182069;p=android-x86%2Fbionic.git

Add fileno_unlocked to support thread sanitizer.

Bug: 25392375
Change-Id: If3f92a0e08a53f4b59e01397e8efa307d8572349
---

diff --git a/libc/include/stdio.h b/libc/include/stdio.h
index 1df4b54f2..fd653d9f4 100644
--- a/libc/include/stdio.h
+++ b/libc/include/stdio.h
@@ -270,6 +270,7 @@ int	 vasprintf(char ** __restrict, const char * __restrict,
 void clearerr_unlocked(FILE*);
 int feof_unlocked(FILE*);
 int ferror_unlocked(FILE*);
+int fileno_unlocked(FILE*);
 
 /*
  * Stdio function-access interface.
diff --git a/libc/libc.arm.map b/libc/libc.arm.map
index bc68fc006..b632d3b15 100644
--- a/libc/libc.arm.map
+++ b/libc/libc.arm.map
@@ -1310,6 +1310,7 @@ LIBC_N {
     __pwrite_chk;
     __pwrite64_chk;
     __write_chk;
+    fileno_unlocked;
     getgrgid_r;
     getgrnam_r;
     preadv;
diff --git a/libc/libc.arm64.map b/libc/libc.arm64.map
index a58b757a6..38023e5bc 100644
--- a/libc/libc.arm64.map
+++ b/libc/libc.arm64.map
@@ -1156,6 +1156,7 @@ LIBC_N {
     __pwrite_chk;
     __pwrite64_chk;
     __write_chk;
+    fileno_unlocked;
     getgrgid_r;
     getgrnam_r;
     preadv;
diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index 418d4cf5c..c3784561f 100644
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -1337,6 +1337,7 @@ LIBC_N {
     __pwrite_chk;
     __pwrite64_chk;
     __write_chk;
+    fileno_unlocked;
     getgrgid_r;
     getgrnam_r;
     preadv;
diff --git a/libc/libc.mips.map b/libc/libc.mips.map
index 0c69c19ba..23123dc0a 100644
--- a/libc/libc.mips.map
+++ b/libc/libc.mips.map
@@ -1273,6 +1273,7 @@ LIBC_N {
     __pwrite_chk;
     __pwrite64_chk;
     __write_chk;
+    fileno_unlocked;
     getgrgid_r;
     getgrnam_r;
     preadv;
diff --git a/libc/libc.mips64.map b/libc/libc.mips64.map
index a58b757a6..38023e5bc 100644
--- a/libc/libc.mips64.map
+++ b/libc/libc.mips64.map
@@ -1156,6 +1156,7 @@ LIBC_N {
     __pwrite_chk;
     __pwrite64_chk;
     __write_chk;
+    fileno_unlocked;
     getgrgid_r;
     getgrnam_r;
     preadv;
diff --git a/libc/libc.x86.map b/libc/libc.x86.map
index 544ee135d..f13ffb00a 100644
--- a/libc/libc.x86.map
+++ b/libc/libc.x86.map
@@ -1271,6 +1271,7 @@ LIBC_N {
     __pwrite_chk;
     __pwrite64_chk;
     __write_chk;
+    fileno_unlocked;
     getgrgid_r;
     getgrnam_r;
     preadv;
diff --git a/libc/libc.x86_64.map b/libc/libc.x86_64.map
index a58b757a6..38023e5bc 100644
--- a/libc/libc.x86_64.map
+++ b/libc/libc.x86_64.map
@@ -1156,6 +1156,7 @@ LIBC_N {
     __pwrite_chk;
     __pwrite64_chk;
     __write_chk;
+    fileno_unlocked;
     getgrgid_r;
     getgrnam_r;
     preadv;
diff --git a/libc/stdio/stdio_ext.cpp b/libc/stdio/stdio_ext.cpp
index fea44f68b..310076a3a 100644
--- a/libc/stdio/stdio_ext.cpp
+++ b/libc/stdio/stdio_ext.cpp
@@ -99,3 +99,7 @@ int feof_unlocked(FILE* fp) {
 int ferror_unlocked(FILE* fp) {
   return __sferror(fp);
 }
+
+int fileno_unlocked(FILE* fp) {
+  return __sfileno(fp);
+}