mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-29 05:51:10 +00:00
698fb75b9f
There are a lot more printf variants than there are scanf variants,
and the code for setting up and tearing down their custom FILE
variants around the call to __vf(w)printf is more complicated and
variable. Therefore, I have added _internal versions of all the
v*printf variants, rather than introducing helper routines so that
they can all directly call __vf(w)printf_internal, as was done with
scanf.
As with the scanf changes, in this patch the _internal functions still
look at the environmental mode bits and all callers pass 0 for the
flags parameter.
Several of the affected public functions had _IO_ name aliases that
were not exported (but, in one case, appeared in libio.h anyway);
I was originally planning to leave them as aliases to avoid having
to touch internal callers, but it turns out ldbl_*_alias only work
for exported symbols, so they've all been removed instead. It also
turns out there were hardly any internal callers. _IO_vsprintf and
_IO_vfprintf *are* exported, so those two stick around.
Summary for the changes to each of the affected symbols:
_IO_vfprintf, _IO_vsprintf:
All internal calls removed, thus the internal declarations, as well
as uses of libc_hidden_proto and libc_hidden_def, were also removed.
The external symbol is now exposed via uses of ldbl_strong_alias
to __vfprintf_internal and __vsprintf_internal, respectively.
_IO_vasprintf, _IO_vdprintf, _IO_vsnprintf,
_IO_vfwprintf, _IO_vswprintf,
_IO_obstack_vprintf, _IO_obstack_printf:
All internal calls removed, thus declaration in internal headers
were also removed. They were never exported, so there are no
aliases tying them to the internal functions. I.e.: entirely gone.
__vsnprintf:
Internal calls were always preceded by macros such as
#define __vsnprintf _IO_vsnprintf, and
#define __vsnprintf vsnprintf
The macros were removed and their uses replaced with calls to the
new internal function __vsnprintf_internal. Since there were no
internal calls, the internal declaration was also removed. The
external symbol is preserved with ldbl_weak_alias to ___vsnprintf.
__vfwprintf:
All internal calls converted into calls to __vfwprintf_internal,
thus the internal declaration was removed. The function is now a
wrapper that calls __vfwprintf_internal. The external symbol is
preserved.
__vswprintf:
Similarly, but no external symbol.
__vasprintf, __vdprintf, __vfprintf, __vsprintf:
New internal wrappers. Not exported.
vasprintf, vdprintf, vfprintf, vsprintf, vsnprintf,
vfwprintf, vswprintf,
obstack_vprintf, obstack_printf:
These functions used to be aliases to the respective _IO_* function,
they are now aliases to their respective __* functions.
Tested for powerpc and powerpc64le.
155 lines
5.2 KiB
C++
155 lines
5.2 KiB
C++
/* Name frobnication for compiling argp outside of glibc
|
|
Copyright (C) 1997-2018 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Written by Miles Bader <miles@gnu.ai.mit.edu>.
|
|
|
|
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/>. */
|
|
|
|
#if !_LIBC
|
|
/* This code is written for inclusion in gnu-libc, and uses names in the
|
|
namespace reserved for libc. If we're not compiling in libc, define those
|
|
names to be the normal ones instead. */
|
|
|
|
/* argp-parse functions */
|
|
#undef __argp_parse
|
|
#define __argp_parse argp_parse
|
|
#undef __option_is_end
|
|
#define __option_is_end _option_is_end
|
|
#undef __option_is_short
|
|
#define __option_is_short _option_is_short
|
|
#undef __argp_input
|
|
#define __argp_input _argp_input
|
|
|
|
/* argp-help functions */
|
|
#undef __argp_help
|
|
#define __argp_help argp_help
|
|
#undef __argp_error
|
|
#define __argp_error argp_error
|
|
#undef __argp_failure
|
|
#define __argp_failure argp_failure
|
|
#undef __argp_state_help
|
|
#define __argp_state_help argp_state_help
|
|
#undef __argp_usage
|
|
#define __argp_usage argp_usage
|
|
|
|
/* argp-fmtstream functions */
|
|
#undef __argp_make_fmtstream
|
|
#define __argp_make_fmtstream argp_make_fmtstream
|
|
#undef __argp_fmtstream_free
|
|
#define __argp_fmtstream_free argp_fmtstream_free
|
|
#undef __argp_fmtstream_putc
|
|
#define __argp_fmtstream_putc argp_fmtstream_putc
|
|
#undef __argp_fmtstream_puts
|
|
#define __argp_fmtstream_puts argp_fmtstream_puts
|
|
#undef __argp_fmtstream_write
|
|
#define __argp_fmtstream_write argp_fmtstream_write
|
|
#undef __argp_fmtstream_printf
|
|
#define __argp_fmtstream_printf argp_fmtstream_printf
|
|
#undef __argp_fmtstream_set_lmargin
|
|
#define __argp_fmtstream_set_lmargin argp_fmtstream_set_lmargin
|
|
#undef __argp_fmtstream_set_rmargin
|
|
#define __argp_fmtstream_set_rmargin argp_fmtstream_set_rmargin
|
|
#undef __argp_fmtstream_set_wmargin
|
|
#define __argp_fmtstream_set_wmargin argp_fmtstream_set_wmargin
|
|
#undef __argp_fmtstream_point
|
|
#define __argp_fmtstream_point argp_fmtstream_point
|
|
#undef __argp_fmtstream_update
|
|
#define __argp_fmtstream_update _argp_fmtstream_update
|
|
#undef __argp_fmtstream_ensure
|
|
#define __argp_fmtstream_ensure _argp_fmtstream_ensure
|
|
#undef __argp_fmtstream_lmargin
|
|
#define __argp_fmtstream_lmargin argp_fmtstream_lmargin
|
|
#undef __argp_fmtstream_rmargin
|
|
#define __argp_fmtstream_rmargin argp_fmtstream_rmargin
|
|
#undef __argp_fmtstream_wmargin
|
|
#define __argp_fmtstream_wmargin argp_fmtstream_wmargin
|
|
|
|
#include "mempcpy.h"
|
|
#include "strcase.h"
|
|
#include "strchrnul.h"
|
|
#include "strndup.h"
|
|
|
|
/* normal libc functions we call */
|
|
#undef __flockfile
|
|
#define __flockfile flockfile
|
|
#undef __funlockfile
|
|
#define __funlockfile funlockfile
|
|
#undef __mempcpy
|
|
#define __mempcpy mempcpy
|
|
#undef __sleep
|
|
#define __sleep sleep
|
|
#undef __strcasecmp
|
|
#define __strcasecmp strcasecmp
|
|
#undef __strchrnul
|
|
#define __strchrnul strchrnul
|
|
#undef __strerror_r
|
|
#define __strerror_r strerror_r
|
|
#undef __strndup
|
|
#define __strndup strndup
|
|
|
|
#if defined(HAVE_DECL_CLEARERR_UNLOCKED) && !HAVE_DECL_CLEARERR_UNLOCKED
|
|
# define clearerr_unlocked(x) clearerr (x)
|
|
#endif
|
|
#if defined(HAVE_DECL_FEOF_UNLOCKED) && !HAVE_DECL_FEOF_UNLOCKED
|
|
# define feof_unlocked(x) feof (x)
|
|
# endif
|
|
#if defined(HAVE_DECL_FERROR_UNLOCKED) && !HAVE_DECL_FERROR_UNLOCKED
|
|
# define ferror_unlocked(x) ferror (x)
|
|
# endif
|
|
#if defined(HAVE_DECL_FFLUSH_UNLOCKED) && !HAVE_DECL_FFLUSH_UNLOCKED
|
|
# define fflush_unlocked(x) fflush (x)
|
|
# endif
|
|
#if defined(HAVE_DECL_FGETS_UNLOCKED) && !HAVE_DECL_FGETS_UNLOCKED
|
|
# define fgets_unlocked(x,y,z) fgets (x,y,z)
|
|
# endif
|
|
#if defined(HAVE_DECL_FPUTC_UNLOCKED) && !HAVE_DECL_FPUTC_UNLOCKED
|
|
# define fputc_unlocked(x,y) fputc (x,y)
|
|
# endif
|
|
#if defined(HAVE_DECL_FPUTS_UNLOCKED) && !HAVE_DECL_FPUTS_UNLOCKED
|
|
# define fputs_unlocked(x,y) fputs (x,y)
|
|
# endif
|
|
#if defined(HAVE_DECL_FREAD_UNLOCKED) && !HAVE_DECL_FREAD_UNLOCKED
|
|
# define fread_unlocked(w,x,y,z) fread (w,x,y,z)
|
|
# endif
|
|
#if defined(HAVE_DECL_FWRITE_UNLOCKED) && !HAVE_DECL_FWRITE_UNLOCKED
|
|
# define fwrite_unlocked(w,x,y,z) fwrite (w,x,y,z)
|
|
# endif
|
|
#if defined(HAVE_DECL_GETC_UNLOCKED) && !HAVE_DECL_GETC_UNLOCKED
|
|
# define getc_unlocked(x) getc (x)
|
|
# endif
|
|
#if defined(HAVE_DECL_GETCHAR_UNLOCKED) && !HAVE_DECL_GETCHAR_UNLOCKED
|
|
# define getchar_unlocked() getchar ()
|
|
# endif
|
|
#if defined(HAVE_DECL_PUTC_UNLOCKED) && !HAVE_DECL_PUTC_UNLOCKED
|
|
# define putc_unlocked(x,y) putc (x,y)
|
|
# endif
|
|
#if defined(HAVE_DECL_PUTCHAR_UNLOCKED) && !HAVE_DECL_PUTCHAR_UNLOCKED
|
|
# define putchar_unlocked(x) putchar (x)
|
|
# endif
|
|
|
|
extern char *__argp_basename (char *name);
|
|
|
|
#endif /* !_LIBC */
|
|
|
|
#ifndef __set_errno
|
|
#define __set_errno(e) (errno = (e))
|
|
#endif
|
|
|
|
#if defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
|
|
# define __argp_short_program_name() (program_invocation_short_name)
|
|
#else
|
|
extern char *__argp_short_program_name (void);
|
|
#endif
|