mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 06:50:07 +00:00
544ce845de
getopt can print a whole bunch of error messages, and when used standalone (from gnulib) it uses fprintf to do that. But fprintf is a cancellation point and getopt isn't, and also applying fprintf to a stream in wide-character mode is not allowed. glibc has an internal function called __fxprintf that writes a narrow format string to a stream regardless of mode, but it only handles ASCII format strings, and it's still a cancellation point. getopt's messages are translated, so they might not be ASCII. So getopt has an error message to an asprintf buffer, monkeys with internal flag bits on stderr to disable cancellation, and then calls __fxprintf(stderr, "%s", buffer). There isn't even a helper function, the code is duplicated every time. This patch fixes __fxprintf to handle arbitrary multibyte format strings, and adds a variant __fxprintf_nocancel that does the same thing but also isn't a cancellation point. (It still _works_ by monkeying with internal flag bits on the FILE, but that's not really a layering violation for code in stdio-common.) All of the #ifdef _LIBC blocks can then be reduced to their standalone versions with a little help from some macros at the top of the file. I also wrote a test case to verify that getopt really isn't a cancellation point, and I'm glad I did, because it found two bugs, one of which wasn't even to do with cancellation (see previous patch). * stdio-common/fxprintf.c (__fxprintf_nocancel): New function. (locked_vfxprintf): New helper function. Handle arbitrary multibyte strings, not just ASCII. * include/stdio.h: Declare __fxprintf_nocancel. * posix/getopt.c: When _LIBC is defined, define fprintf to __fxprintf_nocancel, flockfile to _IO_flockfile, and funlockfile to _IO_funlockfile. When neither _LIBC nor _POSIX_THREAD_SAFE_FUNCTIONS is defined, define flockfile and funlockfile as no-ops. (_getopt_internal_r): Remove all internal #ifdef _LIBC blocks; the standalone error-printing code can now be used for libc as well. Add an flockfile/funlockfile pair around one case where the error message is printed in several chunks. Don't use fputc. * posix/tst-getopt-cancel.c: New test. * posix/Makefile: Run it.
100 lines
2.4 KiB
C
100 lines
2.4 KiB
C
/* Copyright (C) 2005-2017 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 _IO_vfprintf (fp, fmt, ap);
|
|
|
|
/* 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 = _IO_vfwprintf (fp, wfmt, ap);
|
|
|
|
if (used_malloc)
|
|
free (wfmt);
|
|
|
|
return res;
|
|
}
|
|
|
|
int
|
|
__fxprintf (FILE *fp, const char *fmt, ...)
|
|
{
|
|
if (fp == NULL)
|
|
fp = stderr;
|
|
|
|
va_list ap;
|
|
va_start (ap, fmt);
|
|
_IO_flockfile (fp);
|
|
|
|
int res = locked_vfxprintf (fp, fmt, ap);
|
|
|
|
_IO_funlockfile (fp);
|
|
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 = ((_IO_FILE *)fp)->_flags2;
|
|
((_IO_FILE *)fp)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
|
|
|
|
int res = locked_vfxprintf (fp, fmt, ap);
|
|
|
|
((_IO_FILE *)fp)->_flags2 = save_flags2;
|
|
_IO_funlockfile (fp);
|
|
va_end (ap);
|
|
return res;
|
|
}
|