mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08: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.
193 lines
7.2 KiB
C
193 lines
7.2 KiB
C
#ifndef _STDIO_H
|
|
# if defined __need_FILE || defined __need___FILE || defined _ISOMAC
|
|
# include <libio/stdio.h>
|
|
# else
|
|
# include <libio/stdio.h>
|
|
|
|
/* Now define the internal interfaces. */
|
|
__BEGIN_DECLS
|
|
|
|
extern int __fcloseall (void);
|
|
extern int __snprintf (char *__restrict __s, size_t __maxlen,
|
|
const char *__restrict __format, ...)
|
|
__attribute__ ((__format__ (__printf__, 3, 4)));
|
|
libc_hidden_proto (__snprintf)
|
|
extern int __vsnprintf (char *__restrict __s, size_t __maxlen,
|
|
const char *__restrict __format, _G_va_list __arg)
|
|
__attribute__ ((__format__ (__printf__, 3, 0)));
|
|
extern int __vfscanf (FILE *__restrict __s,
|
|
const char *__restrict __format,
|
|
_G_va_list __arg)
|
|
__attribute__ ((__format__ (__scanf__, 2, 0)));
|
|
libc_hidden_proto (__vfscanf)
|
|
extern int __vscanf (const char *__restrict __format,
|
|
_G_va_list __arg)
|
|
__attribute__ ((__format__ (__scanf__, 1, 0)));
|
|
extern _IO_ssize_t __getline (char **__lineptr, size_t *__n,
|
|
FILE *__stream);
|
|
extern int __vsscanf (const char *__restrict __s,
|
|
const char *__restrict __format,
|
|
_G_va_list __arg)
|
|
__attribute__ ((__format__ (__scanf__, 2, 0)));
|
|
|
|
# ifndef __cplusplus
|
|
extern int __sprintf_chk (char *, int, size_t, const char *, ...) __THROW;
|
|
extern int __snprintf_chk (char *, size_t, int, size_t, const char *, ...)
|
|
__THROW;
|
|
extern int __vsprintf_chk (char *, int, size_t, const char *,
|
|
_G_va_list) __THROW;
|
|
extern int __vsnprintf_chk (char *, size_t, int, size_t, const char *,
|
|
_G_va_list) __THROW;
|
|
extern int __printf_chk (int, const char *, ...);
|
|
extern int __fprintf_chk (FILE *, int, const char *, ...);
|
|
extern int __vprintf_chk (int, const char *, _G_va_list);
|
|
extern int __vfprintf_chk (FILE *, int, const char *, _G_va_list);
|
|
extern char *__fgets_unlocked_chk (char *buf, size_t size, int n, FILE *fp);
|
|
extern char *__fgets_chk (char *buf, size_t size, int n, FILE *fp);
|
|
extern int __asprintf_chk (char **, int, const char *, ...) __THROW;
|
|
extern int __vasprintf_chk (char **, int, const char *, _G_va_list) __THROW;
|
|
extern int __dprintf_chk (int, int, const char *, ...);
|
|
extern int __vdprintf_chk (int, int, const char *, _G_va_list);
|
|
extern int __obstack_printf_chk (struct obstack *, int, const char *, ...)
|
|
__THROW;
|
|
extern int __obstack_vprintf_chk (struct obstack *, int, const char *,
|
|
_G_va_list) __THROW;
|
|
# endif
|
|
|
|
extern int __isoc99_fscanf (FILE *__restrict __stream,
|
|
const char *__restrict __format, ...) __wur;
|
|
extern int __isoc99_scanf (const char *__restrict __format, ...) __wur;
|
|
extern int __isoc99_sscanf (const char *__restrict __s,
|
|
const char *__restrict __format, ...) __THROW;
|
|
extern int __isoc99_vfscanf (FILE *__restrict __s,
|
|
const char *__restrict __format,
|
|
_G_va_list __arg) __wur;
|
|
extern int __isoc99_vscanf (const char *__restrict __format,
|
|
_G_va_list __arg) __wur;
|
|
extern int __isoc99_vsscanf (const char *__restrict __s,
|
|
const char *__restrict __format,
|
|
_G_va_list __arg) __THROW;
|
|
libc_hidden_proto (__isoc99_vsscanf)
|
|
libc_hidden_proto (__isoc99_vfscanf)
|
|
|
|
/* Prototypes for compatibility functions. */
|
|
extern FILE *__new_tmpfile (void);
|
|
extern FILE *__old_tmpfile (void);
|
|
|
|
|
|
|
|
# define __need_size_t
|
|
# define __need_wint_t
|
|
# include <stddef.h>
|
|
/* Generate a unique file name (and possibly open it). */
|
|
extern int __path_search (char *__tmpl, size_t __tmpl_len,
|
|
const char *__dir, const char *__pfx,
|
|
int __try_tempdir);
|
|
|
|
extern int __gen_tempname (char *__tmpl, int __suffixlen, int __flags,
|
|
int __kind);
|
|
/* The __kind argument to __gen_tempname may be one of: */
|
|
# define __GT_FILE 0 /* create a file */
|
|
# define __GT_DIR 1 /* create a directory */
|
|
# define __GT_NOCREATE 2 /* just find a name not currently in use */
|
|
|
|
/* Print out MESSAGE on the error output and abort. */
|
|
extern void __libc_fatal (const char *__message)
|
|
__attribute__ ((__noreturn__));
|
|
extern void __libc_message (int do_abort, const char *__fnt, ...);
|
|
extern void __fortify_fail (const char *msg)
|
|
__attribute__ ((__noreturn__)) internal_function;
|
|
libc_hidden_proto (__fortify_fail)
|
|
|
|
/* Acquire ownership of STREAM. */
|
|
extern void __flockfile (FILE *__stream);
|
|
|
|
/* Relinquish the ownership granted for STREAM. */
|
|
extern void __funlockfile (FILE *__stream);
|
|
|
|
/* Try to acquire ownership of STREAM but do not block if it is not
|
|
possible. */
|
|
extern int __ftrylockfile (FILE *__stream);
|
|
|
|
extern int __getc_unlocked (FILE *__fp);
|
|
extern wint_t __getwc_unlocked (FILE *__fp);
|
|
|
|
extern int __fxprintf (FILE *__fp, const char *__fmt, ...)
|
|
__attribute__ ((__format__ (__printf__, 2, 3)));
|
|
extern int __fxprintf_nocancel (FILE *__fp, const char *__fmt, ...)
|
|
__attribute__ ((__format__ (__printf__, 2, 3)));
|
|
|
|
extern const char *const _sys_errlist_internal[] attribute_hidden;
|
|
extern int _sys_nerr_internal attribute_hidden;
|
|
|
|
libc_hidden_proto (__asprintf)
|
|
# if IS_IN (libc)
|
|
extern _IO_FILE *_IO_new_fopen (const char*, const char*);
|
|
# define fopen(fname, mode) _IO_new_fopen (fname, mode)
|
|
extern _IO_FILE *_IO_new_fdopen (int, const char*);
|
|
# define fdopen(fd, mode) _IO_new_fdopen (fd, mode)
|
|
extern int _IO_new_fclose (_IO_FILE*);
|
|
# define fclose(fp) _IO_new_fclose (fp)
|
|
extern int _IO_fputs (const char*, _IO_FILE*);
|
|
libc_hidden_proto (_IO_fputs)
|
|
# define fputs(str, fp) _IO_fputs (str, fp)
|
|
extern int _IO_new_fsetpos (_IO_FILE *, const _IO_fpos_t *);
|
|
# define fsetpos(fp, posp) _IO_new_fsetpos (fp, posp)
|
|
extern int _IO_new_fgetpos (_IO_FILE *, _IO_fpos_t *);
|
|
# define fgetpos(fp, posp) _IO_new_fgetpos (fp, posp)
|
|
# endif
|
|
|
|
libc_hidden_proto (dprintf)
|
|
extern __typeof (dprintf) __dprintf
|
|
__attribute__ ((__format__ (__printf__, 2, 3)));
|
|
libc_hidden_proto (__dprintf)
|
|
libc_hidden_proto (fprintf)
|
|
libc_hidden_proto (vfprintf)
|
|
libc_hidden_proto (sprintf)
|
|
libc_hidden_proto (sscanf)
|
|
libc_hidden_proto (fwrite)
|
|
libc_hidden_proto (perror)
|
|
libc_hidden_proto (remove)
|
|
libc_hidden_proto (rewind)
|
|
libc_hidden_proto (fileno)
|
|
extern __typeof (fileno) __fileno;
|
|
libc_hidden_proto (__fileno)
|
|
libc_hidden_proto (fwrite)
|
|
libc_hidden_proto (fseek)
|
|
extern __typeof (ftello) __ftello;
|
|
libc_hidden_proto (__ftello)
|
|
libc_hidden_proto (fflush)
|
|
libc_hidden_proto (fflush_unlocked)
|
|
extern __typeof (fflush_unlocked) __fflush_unlocked;
|
|
libc_hidden_proto (__fflush_unlocked)
|
|
extern __typeof (fread_unlocked) __fread_unlocked;
|
|
libc_hidden_proto (__fread_unlocked)
|
|
libc_hidden_proto (fwrite_unlocked)
|
|
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. */
|
|
extern FILE *__open_memstream (char **, size_t *) __THROW __wur;
|
|
libc_hidden_proto (__open_memstream)
|
|
libc_hidden_proto (__libc_fatal)
|
|
rtld_hidden_proto (__libc_fatal)
|
|
libc_hidden_proto (__vsprintf_chk)
|
|
libc_hidden_proto (__vsnprintf_chk)
|
|
libc_hidden_proto (__vfprintf_chk)
|
|
libc_hidden_proto (__vasprintf_chk)
|
|
libc_hidden_proto (__vdprintf_chk)
|
|
libc_hidden_proto (__obstack_vprintf_chk)
|
|
|
|
extern FILE * __fmemopen (void *buf, size_t len, const char *mode);
|
|
libc_hidden_proto (__fmemopen)
|
|
|
|
__END_DECLS
|
|
# endif
|
|
|
|
#endif
|