mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-16 05:40:08 +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.
104 lines
2.5 KiB
C
104 lines
2.5 KiB
C
/* Copyright (C) 2005-2018 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.org>.
|
|
|
|
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/>. */
|
|
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <wchar.h>
|
|
#include <libioP.h>
|
|
|
|
static int
|
|
locked_vfxprintf (FILE *fp, const char *fmt, va_list ap)
|
|
{
|
|
if (_IO_fwide (fp, 0) <= 0)
|
|
return __vfprintf_internal (fp, fmt, ap, 0);
|
|
|
|
/* We must convert the narrow format string to a wide one.
|
|
Each byte can produce at most one wide character. */
|
|
wchar_t *wfmt;
|
|
mbstate_t mbstate;
|
|
int res;
|
|
int used_malloc = 0;
|
|
size_t len = strlen (fmt) + 1;
|
|
|
|
if (__glibc_unlikely (len > SIZE_MAX / sizeof (wchar_t)))
|
|
{
|
|
__set_errno (EOVERFLOW);
|
|
return -1;
|
|
}
|
|
if (__libc_use_alloca (len * sizeof (wchar_t)))
|
|
wfmt = alloca (len * sizeof (wchar_t));
|
|
else if ((wfmt = malloc (len * sizeof (wchar_t))) == NULL)
|
|
return -1;
|
|
else
|
|
used_malloc = 1;
|
|
|
|
memset (&mbstate, 0, sizeof mbstate);
|
|
res = __mbsrtowcs (wfmt, &fmt, len, &mbstate);
|
|
|
|
if (res != -1)
|
|
res = __vfwprintf_internal (fp, wfmt, ap, 0);
|
|
|
|
if (used_malloc)
|
|
free (wfmt);
|
|
|
|
return res;
|
|
}
|
|
|
|
int
|
|
__vfxprintf (FILE *fp, const char *fmt, va_list ap)
|
|
{
|
|
if (fp == NULL)
|
|
fp = stderr;
|
|
_IO_flockfile (fp);
|
|
int res = locked_vfxprintf (fp, fmt, ap);
|
|
_IO_funlockfile (fp);
|
|
return res;
|
|
}
|
|
|
|
int
|
|
__fxprintf (FILE *fp, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
va_start (ap, fmt);
|
|
int res = __vfxprintf (fp, fmt, ap);
|
|
va_end (ap);
|
|
return res;
|
|
}
|
|
|
|
int
|
|
__fxprintf_nocancel (FILE *fp, const char *fmt, ...)
|
|
{
|
|
if (fp == NULL)
|
|
fp = stderr;
|
|
|
|
va_list ap;
|
|
va_start (ap, fmt);
|
|
_IO_flockfile (fp);
|
|
int save_flags2 = fp->_flags2;
|
|
fp->_flags2 |= _IO_FLAGS2_NOTCANCEL;
|
|
|
|
int res = locked_vfxprintf (fp, fmt, ap);
|
|
|
|
fp->_flags2 = save_flags2;
|
|
_IO_funlockfile (fp);
|
|
va_end (ap);
|
|
return res;
|
|
}
|