summary refs log tree commit diff
path: root/stdio-common
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-11-24 15:59:15 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-11-24 15:59:15 +0000
commit9744496f8a479c23174cc330e4d422f130804c04 (patch)
treea2cdc6907445d1708b6f5c1ec71be968ed76d048 /stdio-common
parent6423d4754c3769129510b9b44b6b8cfe8192ec67 (diff)
downloadglibc-9744496f8a479c23174cc330e4d422f130804c04.tar.gz
glibc-9744496f8a479c23174cc330e4d422f130804c04.tar.xz
glibc-9744496f8a479c23174cc330e4d422f130804c04.zip
Fix perror fileno namespace (bug 17633).
perror, an ISO C function, uses fileno, which is not an ISO C
function.  This patch makes it use __fileno instead.  (The nearby call
to fdopen is not a problem because that's #defined to _IO_new_fdopen.)

Tested for x86_64 (testsuite, and that installed stripped shared
libraries are unchanged by this patch).

	[BZ #17633]
	* stdio-common/perror.c (perror): Call __fileno instead of fileno.
	* conform/Makefile (test-xfail-ISO/stdio.h/linknamespace): Remove
	variable.
	(test-xfail-ISO99/stdio.h/linknamespace): Likewise.
	(test-xfail-ISO11/stdio.h/linknamespace): Likewise.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/perror.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/stdio-common/perror.c b/stdio-common/perror.c
index 4b470156a6..7de83e4d32 100644
--- a/stdio-common/perror.c
+++ b/stdio-common/perror.c
@@ -56,7 +56,7 @@ perror (const char *s)
      oriented yet?  In this case we'll create a new stream which is
      using the same underlying file descriptor.  */
   if (__builtin_expect (_IO_fwide (stderr, 0) != 0, 1)
-      || (fd = fileno (stderr)) == -1
+      || (fd = __fileno (stderr)) == -1
       || (fd = __dup (fd)) == -1
       || (fp = fdopen (fd, "w+")) == NULL)
     {