mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-13 00:30:07 +00:00
3164bf09f5
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. [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.
57 lines
1.9 KiB
C
57 lines
1.9 KiB
C
/* Copyright (C) 1993-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>.
|
|
|
|
As a special exception, if you link the code in this file with
|
|
files compiled with a GNU compiler to produce an executable,
|
|
that does not cause the resulting executable to be covered by
|
|
the GNU Lesser General Public License. This exception does not
|
|
however invalidate any other reasons why the executable file
|
|
might be covered by the GNU Lesser General Public License.
|
|
This exception applies to code released by its copyright holders
|
|
in files containing the exception. */
|
|
|
|
#include "libioP.h"
|
|
#include <string.h>
|
|
|
|
int
|
|
_IO_fputs (str, fp)
|
|
const char *str;
|
|
_IO_FILE *fp;
|
|
{
|
|
_IO_size_t len = strlen (str);
|
|
int result = EOF;
|
|
CHECK_FILE (fp, EOF);
|
|
_IO_acquire_lock (fp);
|
|
if ((_IO_vtable_offset (fp) != 0 || _IO_fwide (fp, -1) == -1)
|
|
&& _IO_sputn (fp, str, len) == len)
|
|
result = 1;
|
|
_IO_release_lock (fp);
|
|
return result;
|
|
}
|
|
libc_hidden_def (_IO_fputs)
|
|
|
|
#ifdef weak_alias
|
|
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
|
|
#endif
|