From eb1fae6a450b3cce5a75c1ed1a734520c56a6457 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 17 Jun 2015 20:14:18 +0000 Subject: Fix getpass fflush_unlocked namespace (bug 18540). The getpass function (XPG3 / XPG4 / UNIX98) calls fflush_unlocked (not in any of those standards). This patch fixes this by making fflush_unlocked into a weak alias for __fflush_unlocked and calling __fflush_unlocked from getpass. Tested for x86_64 and x86 (testsuite, and that disassembly of installed stripped shared libraries is unchanged by the patch). [BZ #18540] * libio/iofflush.c [!_IO_MTSAFE_IO] (__fflush_unlocked): Define as strong alias of _IO_fflush. Use libc_hidden_def. * libio/iofflush_u.c (fflush_unlocked): Rename to __fflush_unlocked and define as weak alias of __fflush_unlocked. Use libc_hidden_weak. * include/stdio.h (__fflush_unlocked): Declare. Use libc_hidden_proto. * misc/getpass.c (getpass): Call __fflush_unlocked instead of fflush_unlocked. * conform/Makefile (test-xfail-UNIX98/unistd.h/linknamespace): Remove variable. --- include/stdio.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/stdio.h b/include/stdio.h index 9cd324b..5e50e63 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -155,6 +155,8 @@ extern __typeof (ftello) __ftello; libc_hidden_proto (__ftello) libc_hidden_proto (fflush) libc_hidden_proto (fflush_unlocked) +extern __typeof (fflush_unlocked) __fflush_unlocked; +libc_hidden_proto (__fflush_unlocked) extern __typeof (fread_unlocked) __fread_unlocked; libc_hidden_proto (__fread_unlocked) libc_hidden_proto (fwrite_unlocked) -- cgit v1.1