This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Fix syslog fputs_unlocked namespace (bug 18530)
- From: Joseph Myers <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Fri, 12 Jun 2015 22:26:06 +0000
- Subject: Fix syslog fputs_unlocked namespace (bug 18530)
- Authentication-results: sourceware.org; auth=none
syslog (XSI POSIX) brings in references to fputs_unlocked (not
POSIX). This patch fixes this by making fputs_unlocked into a weak
alias for __fputs_unlocked and using __fputs_unlocked as needed. (No
linknamespace test XFAILs are removed because there are other failures
from syslog as well.)
Tested for x86_64 and x86 (testsuite, and comparison of disassembly of
installed stripped shared libraries). Disassembly of installed
stripped shared libraries is unchanged on x86_64; on x86, I see some
small changes to instruction ordering and register choice, with no
apparent reason for such changes to be related to this patch, but they
also seem completely harmless with no change to code size.
2015-06-12 Joseph Myers <joseph@codesourcery.com>
[BZ #18530]
* libio/iofputs.c [!_IO_MTSAFE_IO] (__fputs_unlocked): Define as
strong alias of _IO_fputs. Use libc_hidden_def.
* libio/iofputs_u.c (fputs_unlocked): Rename to __fputs_unlocked
and define as weak alias of __fputs_unlocked. Use
libc_hidden_weak.
* include/stdio.h (__fputs_unlocked): Declare. Use
libc_hidden_proto.
* misc/syslog.c (__vsyslog_chk): Call __fputs_unlocked instead of
fputs_unlocked.
diff --git a/include/stdio.h b/include/stdio.h
index 489e419..6ae70a3 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -159,6 +159,8 @@ libc_hidden_proto (fgets_unlocked)
extern __typeof (fgets_unlocked) __fgets_unlocked;
libc_hidden_proto (__fgets_unlocked)
libc_hidden_proto (fputs_unlocked)
+extern __typeof (fputs_unlocked) __fputs_unlocked;
+libc_hidden_proto (__fputs_unlocked)
libc_hidden_proto (fmemopen)
/* The prototype needs repeating instead of using __typeof to use
__THROW in C++ tests. */
diff --git a/libio/iofputs.c b/libio/iofputs.c
index 00c1cba..d1e34e4 100644
--- a/libio/iofputs.c
+++ b/libio/iofputs.c
@@ -48,6 +48,8 @@ libc_hidden_def (_IO_fputs)
weak_alias (_IO_fputs, fputs)
# ifndef _IO_MTSAFE_IO
+strong_alias (_IO_fputs, __fputs_unlocked)
+libc_hidden_def (__fputs_unlocked)
weak_alias (_IO_fputs, fputs_unlocked)
libc_hidden_ver (_IO_fputs, fputs_unlocked)
# endif
diff --git a/libio/iofputs_u.c b/libio/iofputs_u.c
index 6f79838..f823686 100644
--- a/libio/iofputs_u.c
+++ b/libio/iofputs_u.c
@@ -29,7 +29,7 @@
#include <string.h>
int
-fputs_unlocked (str, fp)
+__fputs_unlocked (str, fp)
const char *str;
_IO_FILE *fp;
{
@@ -40,4 +40,6 @@ fputs_unlocked (str, fp)
result = 1;
return result;
}
-libc_hidden_def (fputs_unlocked)
+libc_hidden_def (__fputs_unlocked)
+weak_alias (__fputs_unlocked, fputs_unlocked)
+libc_hidden_weak (fputs_unlocked)
diff --git a/misc/syslog.c b/misc/syslog.c
index 23a4f7b..3979f42 100644
--- a/misc/syslog.c
+++ b/misc/syslog.c
@@ -202,7 +202,7 @@ __vsyslog_chk(int pri, int flag, const char *fmt, va_list ap)
if (LogTag == NULL)
LogTag = __progname;
if (LogTag != NULL)
- fputs_unlocked (LogTag, f);
+ __fputs_unlocked (LogTag, f);
if (LogStat & LOG_PID)
fprintf (f, "[%d]", (int) __getpid ());
if (LogTag != NULL)
--
Joseph S. Myers
joseph@codesourcery.com