mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 19:30:10 +00:00
acd7f096d7
This patch completes the headers cleanup consequent on removal of _BSD_SOURCE and _SVID_SOURCE (apart from any subsequent deprecations): * #endif conditionals that referred to BSD or SVID are updated. * Redundant __USE_* tests in cases involving __USE_MISC are removed. This includes cases such as __USE_MISC || __USE_ISOC99, where __USE_MISC is redundant (because __USE_MISC is only ever defined in the default / _DEFAULT_SOURCE / _GNU_SOURCE case, when __USE_ISOC99 is also defined; the same applies to the non-XSI-extended POSIX versions), and cases involving __USE_GNU, where __USE_GNU is redundant (because if __USE_GNU is defined, so are the other __USE_* macros). There may well be other cases of __USE_FOO || __USE_BAR tests that could be simplified because one macro implies the other; this patch only addresses cases involving __USE_MISC. Tested x86_64. * bits/fcntl.h [__USE_MISC]: Remove redundant conditionals. * bits/sigaction.h [__USE_MISC]: Likewise. * bits/waitstatus.h: Update #endif comments. * ctype/ctype.h: Likewise. * dirent/dirent.h: Likewise. [__USE_MISC]: Remove redundant conditionals. * grp/grp.h: Update #endif comments. [__USE_GNU]: Remove redundant conditionals. [__USE_MISC]: Likewise. * inet/netinet/in.h [__USE_GNU]: Likewise. * io/sys/stat.h [__USE_MISC]: Likewise. * libio/bits/stdio-ldbl.h [__USE_MISC]: Likewise. * libio/bits/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * libio/bits/stdio2.h [__USE_MISC]: Likewise. * libio/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * math/bits/math-finite.h [__USE_MISC]: Likewise. * math/bits/mathcalls.h [__USE_MISC]: Likewise. * math/math.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. * misc/sys/uio.h: Update #endif comments. * posix/bits/unistd.h [__USE_MISC]: Remove redundant conditionals. * posix/glob.h [__USE_MISC]: Likewise. * posix/sys/types.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/sys/wait.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/unistd.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * pwd/pwd.h [__USE_GNU]: Likewise. [__USE_MISC]: Likewise. * resolv/netdb.h [__USE_GNU]: Likewise. * signal/signal.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * stdlib/stdlib.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. [__USE_GNU]: Likewise. * string/bits/string2.h [__USE_MISC]: Likewise. * string/string.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/m68k/m680x0/fpu/bits/mathinline.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/fcntl.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl-linux.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/unix/sysv/linux/bits/in.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/ia64/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/x86/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/x86/bits/string.h: Update #endif comments. * sysdeps/x86/fpu/bits/mathinline.h [__USE_MISC]: Remove redundant conditionals. * time/sys/time.h: Update #endif comments. * time/time.h: Likewise. [__USE_MISC]: Remove redundant conditionals.
383 lines
12 KiB
C
383 lines
12 KiB
C
/* Checking macros for stdio functions.
|
|
Copyright (C) 2004-2014 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/>. */
|
|
|
|
#ifndef _STDIO_H
|
|
# error "Never include <bits/stdio2.h> directly; use <stdio.h> instead."
|
|
#endif
|
|
|
|
extern int __sprintf_chk (char *__restrict __s, int __flag, size_t __slen,
|
|
const char *__restrict __format, ...) __THROW;
|
|
extern int __vsprintf_chk (char *__restrict __s, int __flag, size_t __slen,
|
|
const char *__restrict __format,
|
|
_G_va_list __ap) __THROW;
|
|
|
|
#ifdef __va_arg_pack
|
|
__fortify_function int
|
|
__NTH (sprintf (char *__restrict __s, const char *__restrict __fmt, ...))
|
|
{
|
|
return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1,
|
|
__bos (__s), __fmt, __va_arg_pack ());
|
|
}
|
|
#elif !defined __cplusplus
|
|
# define sprintf(str, ...) \
|
|
__builtin___sprintf_chk (str, __USE_FORTIFY_LEVEL - 1, __bos (str), \
|
|
__VA_ARGS__)
|
|
#endif
|
|
|
|
__fortify_function int
|
|
__NTH (vsprintf (char *__restrict __s, const char *__restrict __fmt,
|
|
_G_va_list __ap))
|
|
{
|
|
return __builtin___vsprintf_chk (__s, __USE_FORTIFY_LEVEL - 1,
|
|
__bos (__s), __fmt, __ap);
|
|
}
|
|
|
|
#if defined __USE_ISOC99 || defined __USE_UNIX98
|
|
|
|
extern int __snprintf_chk (char *__restrict __s, size_t __n, int __flag,
|
|
size_t __slen, const char *__restrict __format,
|
|
...) __THROW;
|
|
extern int __vsnprintf_chk (char *__restrict __s, size_t __n, int __flag,
|
|
size_t __slen, const char *__restrict __format,
|
|
_G_va_list __ap) __THROW;
|
|
|
|
# ifdef __va_arg_pack
|
|
__fortify_function int
|
|
__NTH (snprintf (char *__restrict __s, size_t __n,
|
|
const char *__restrict __fmt, ...))
|
|
{
|
|
return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
|
|
__bos (__s), __fmt, __va_arg_pack ());
|
|
}
|
|
# elif !defined __cplusplus
|
|
# define snprintf(str, len, ...) \
|
|
__builtin___snprintf_chk (str, len, __USE_FORTIFY_LEVEL - 1, __bos (str), \
|
|
__VA_ARGS__)
|
|
# endif
|
|
|
|
__fortify_function int
|
|
__NTH (vsnprintf (char *__restrict __s, size_t __n,
|
|
const char *__restrict __fmt, _G_va_list __ap))
|
|
{
|
|
return __builtin___vsnprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
|
|
__bos (__s), __fmt, __ap);
|
|
}
|
|
|
|
#endif
|
|
|
|
#if __USE_FORTIFY_LEVEL > 1
|
|
|
|
extern int __fprintf_chk (FILE *__restrict __stream, int __flag,
|
|
const char *__restrict __format, ...);
|
|
extern int __printf_chk (int __flag, const char *__restrict __format, ...);
|
|
extern int __vfprintf_chk (FILE *__restrict __stream, int __flag,
|
|
const char *__restrict __format, _G_va_list __ap);
|
|
extern int __vprintf_chk (int __flag, const char *__restrict __format,
|
|
_G_va_list __ap);
|
|
|
|
# ifdef __va_arg_pack
|
|
__fortify_function int
|
|
fprintf (FILE *__restrict __stream, const char *__restrict __fmt, ...)
|
|
{
|
|
return __fprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, __fmt,
|
|
__va_arg_pack ());
|
|
}
|
|
|
|
__fortify_function int
|
|
printf (const char *__restrict __fmt, ...)
|
|
{
|
|
return __printf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
|
|
}
|
|
# elif !defined __cplusplus
|
|
# define printf(...) \
|
|
__printf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
|
|
# define fprintf(stream, ...) \
|
|
__fprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
|
|
# endif
|
|
|
|
__fortify_function int
|
|
vprintf (const char *__restrict __fmt, _G_va_list __ap)
|
|
{
|
|
#ifdef __USE_EXTERN_INLINES
|
|
return __vfprintf_chk (stdout, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
|
|
#else
|
|
return __vprintf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __ap);
|
|
#endif
|
|
}
|
|
|
|
__fortify_function int
|
|
vfprintf (FILE *__restrict __stream,
|
|
const char *__restrict __fmt, _G_va_list __ap)
|
|
{
|
|
return __vfprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
|
|
}
|
|
|
|
# ifdef __USE_XOPEN2K8
|
|
extern int __dprintf_chk (int __fd, int __flag, const char *__restrict __fmt,
|
|
...) __attribute__ ((__format__ (__printf__, 3, 4)));
|
|
extern int __vdprintf_chk (int __fd, int __flag,
|
|
const char *__restrict __fmt, _G_va_list __arg)
|
|
__attribute__ ((__format__ (__printf__, 3, 0)));
|
|
|
|
# ifdef __va_arg_pack
|
|
__fortify_function int
|
|
dprintf (int __fd, const char *__restrict __fmt, ...)
|
|
{
|
|
return __dprintf_chk (__fd, __USE_FORTIFY_LEVEL - 1, __fmt,
|
|
__va_arg_pack ());
|
|
}
|
|
# elif !defined __cplusplus
|
|
# define dprintf(fd, ...) \
|
|
__dprintf_chk (fd, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
|
|
# endif
|
|
|
|
__fortify_function int
|
|
vdprintf (int __fd, const char *__restrict __fmt, _G_va_list __ap)
|
|
{
|
|
return __vdprintf_chk (__fd, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
|
|
}
|
|
# endif
|
|
|
|
# ifdef __USE_GNU
|
|
|
|
extern int __asprintf_chk (char **__restrict __ptr, int __flag,
|
|
const char *__restrict __fmt, ...)
|
|
__THROW __attribute__ ((__format__ (__printf__, 3, 4))) __wur;
|
|
extern int __vasprintf_chk (char **__restrict __ptr, int __flag,
|
|
const char *__restrict __fmt, _G_va_list __arg)
|
|
__THROW __attribute__ ((__format__ (__printf__, 3, 0))) __wur;
|
|
extern int __obstack_printf_chk (struct obstack *__restrict __obstack,
|
|
int __flag, const char *__restrict __format,
|
|
...)
|
|
__THROW __attribute__ ((__format__ (__printf__, 3, 4)));
|
|
extern int __obstack_vprintf_chk (struct obstack *__restrict __obstack,
|
|
int __flag,
|
|
const char *__restrict __format,
|
|
_G_va_list __args)
|
|
__THROW __attribute__ ((__format__ (__printf__, 3, 0)));
|
|
|
|
# ifdef __va_arg_pack
|
|
__fortify_function int
|
|
__NTH (asprintf (char **__restrict __ptr, const char *__restrict __fmt, ...))
|
|
{
|
|
return __asprintf_chk (__ptr, __USE_FORTIFY_LEVEL - 1, __fmt,
|
|
__va_arg_pack ());
|
|
}
|
|
|
|
__fortify_function int
|
|
__NTH (__asprintf (char **__restrict __ptr, const char *__restrict __fmt,
|
|
...))
|
|
{
|
|
return __asprintf_chk (__ptr, __USE_FORTIFY_LEVEL - 1, __fmt,
|
|
__va_arg_pack ());
|
|
}
|
|
|
|
__fortify_function int
|
|
__NTH (obstack_printf (struct obstack *__restrict __obstack,
|
|
const char *__restrict __fmt, ...))
|
|
{
|
|
return __obstack_printf_chk (__obstack, __USE_FORTIFY_LEVEL - 1, __fmt,
|
|
__va_arg_pack ());
|
|
}
|
|
# elif !defined __cplusplus
|
|
# define asprintf(ptr, ...) \
|
|
__asprintf_chk (ptr, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
|
|
# define __asprintf(ptr, ...) \
|
|
__asprintf_chk (ptr, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
|
|
# define obstack_printf(obstack, ...) \
|
|
__obstack_printf_chk (obstack, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
|
|
# endif
|
|
|
|
__fortify_function int
|
|
__NTH (vasprintf (char **__restrict __ptr, const char *__restrict __fmt,
|
|
_G_va_list __ap))
|
|
{
|
|
return __vasprintf_chk (__ptr, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
|
|
}
|
|
|
|
__fortify_function int
|
|
__NTH (obstack_vprintf (struct obstack *__restrict __obstack,
|
|
const char *__restrict __fmt, _G_va_list __ap))
|
|
{
|
|
return __obstack_vprintf_chk (__obstack, __USE_FORTIFY_LEVEL - 1, __fmt,
|
|
__ap);
|
|
}
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
#if !defined __USE_ISOC11 \
|
|
|| (defined __cplusplus && __cplusplus <= 201103L && !defined __USE_GNU)
|
|
extern char *__gets_chk (char *__str, size_t) __wur;
|
|
extern char *__REDIRECT (__gets_warn, (char *__str), gets)
|
|
__wur __warnattr ("please use fgets or getline instead, gets can't "
|
|
"specify buffer size");
|
|
|
|
__fortify_function __wur char *
|
|
gets (char *__str)
|
|
{
|
|
if (__bos (__str) != (size_t) -1)
|
|
return __gets_chk (__str, __bos (__str));
|
|
return __gets_warn (__str);
|
|
}
|
|
#endif
|
|
|
|
extern char *__fgets_chk (char *__restrict __s, size_t __size, int __n,
|
|
FILE *__restrict __stream) __wur;
|
|
extern char *__REDIRECT (__fgets_alias,
|
|
(char *__restrict __s, int __n,
|
|
FILE *__restrict __stream), fgets) __wur;
|
|
extern char *__REDIRECT (__fgets_chk_warn,
|
|
(char *__restrict __s, size_t __size, int __n,
|
|
FILE *__restrict __stream), __fgets_chk)
|
|
__wur __warnattr ("fgets called with bigger size than length "
|
|
"of destination buffer");
|
|
|
|
__fortify_function __wur char *
|
|
fgets (char *__restrict __s, int __n, FILE *__restrict __stream)
|
|
{
|
|
if (__bos (__s) != (size_t) -1)
|
|
{
|
|
if (!__builtin_constant_p (__n) || __n <= 0)
|
|
return __fgets_chk (__s, __bos (__s), __n, __stream);
|
|
|
|
if ((size_t) __n > __bos (__s))
|
|
return __fgets_chk_warn (__s, __bos (__s), __n, __stream);
|
|
}
|
|
return __fgets_alias (__s, __n, __stream);
|
|
}
|
|
|
|
extern size_t __fread_chk (void *__restrict __ptr, size_t __ptrlen,
|
|
size_t __size, size_t __n,
|
|
FILE *__restrict __stream) __wur;
|
|
extern size_t __REDIRECT (__fread_alias,
|
|
(void *__restrict __ptr, size_t __size,
|
|
size_t __n, FILE *__restrict __stream),
|
|
fread) __wur;
|
|
extern size_t __REDIRECT (__fread_chk_warn,
|
|
(void *__restrict __ptr, size_t __ptrlen,
|
|
size_t __size, size_t __n,
|
|
FILE *__restrict __stream),
|
|
__fread_chk)
|
|
__wur __warnattr ("fread called with bigger size * nmemb than length "
|
|
"of destination buffer");
|
|
|
|
__fortify_function __wur size_t
|
|
fread (void *__restrict __ptr, size_t __size, size_t __n,
|
|
FILE *__restrict __stream)
|
|
{
|
|
if (__bos0 (__ptr) != (size_t) -1)
|
|
{
|
|
if (!__builtin_constant_p (__size)
|
|
|| !__builtin_constant_p (__n)
|
|
|| (__size | __n) >= (((size_t) 1) << (8 * sizeof (size_t) / 2)))
|
|
return __fread_chk (__ptr, __bos0 (__ptr), __size, __n, __stream);
|
|
|
|
if (__size * __n > __bos0 (__ptr))
|
|
return __fread_chk_warn (__ptr, __bos0 (__ptr), __size, __n, __stream);
|
|
}
|
|
return __fread_alias (__ptr, __size, __n, __stream);
|
|
}
|
|
|
|
#ifdef __USE_GNU
|
|
extern char *__fgets_unlocked_chk (char *__restrict __s, size_t __size,
|
|
int __n, FILE *__restrict __stream) __wur;
|
|
extern char *__REDIRECT (__fgets_unlocked_alias,
|
|
(char *__restrict __s, int __n,
|
|
FILE *__restrict __stream), fgets_unlocked) __wur;
|
|
extern char *__REDIRECT (__fgets_unlocked_chk_warn,
|
|
(char *__restrict __s, size_t __size, int __n,
|
|
FILE *__restrict __stream), __fgets_unlocked_chk)
|
|
__wur __warnattr ("fgets_unlocked called with bigger size than length "
|
|
"of destination buffer");
|
|
|
|
__fortify_function __wur char *
|
|
fgets_unlocked (char *__restrict __s, int __n, FILE *__restrict __stream)
|
|
{
|
|
if (__bos (__s) != (size_t) -1)
|
|
{
|
|
if (!__builtin_constant_p (__n) || __n <= 0)
|
|
return __fgets_unlocked_chk (__s, __bos (__s), __n, __stream);
|
|
|
|
if ((size_t) __n > __bos (__s))
|
|
return __fgets_unlocked_chk_warn (__s, __bos (__s), __n, __stream);
|
|
}
|
|
return __fgets_unlocked_alias (__s, __n, __stream);
|
|
}
|
|
#endif
|
|
|
|
#ifdef __USE_MISC
|
|
# undef fread_unlocked
|
|
extern size_t __fread_unlocked_chk (void *__restrict __ptr, size_t __ptrlen,
|
|
size_t __size, size_t __n,
|
|
FILE *__restrict __stream) __wur;
|
|
extern size_t __REDIRECT (__fread_unlocked_alias,
|
|
(void *__restrict __ptr, size_t __size,
|
|
size_t __n, FILE *__restrict __stream),
|
|
fread_unlocked) __wur;
|
|
extern size_t __REDIRECT (__fread_unlocked_chk_warn,
|
|
(void *__restrict __ptr, size_t __ptrlen,
|
|
size_t __size, size_t __n,
|
|
FILE *__restrict __stream),
|
|
__fread_unlocked_chk)
|
|
__wur __warnattr ("fread_unlocked called with bigger size * nmemb than "
|
|
"length of destination buffer");
|
|
|
|
__fortify_function __wur size_t
|
|
fread_unlocked (void *__restrict __ptr, size_t __size, size_t __n,
|
|
FILE *__restrict __stream)
|
|
{
|
|
if (__bos0 (__ptr) != (size_t) -1)
|
|
{
|
|
if (!__builtin_constant_p (__size)
|
|
|| !__builtin_constant_p (__n)
|
|
|| (__size | __n) >= (((size_t) 1) << (8 * sizeof (size_t) / 2)))
|
|
return __fread_unlocked_chk (__ptr, __bos0 (__ptr), __size, __n,
|
|
__stream);
|
|
|
|
if (__size * __n > __bos0 (__ptr))
|
|
return __fread_unlocked_chk_warn (__ptr, __bos0 (__ptr), __size, __n,
|
|
__stream);
|
|
}
|
|
|
|
# ifdef __USE_EXTERN_INLINES
|
|
if (__builtin_constant_p (__size)
|
|
&& __builtin_constant_p (__n)
|
|
&& (__size | __n) < (((size_t) 1) << (8 * sizeof (size_t) / 2))
|
|
&& __size * __n <= 8)
|
|
{
|
|
size_t __cnt = __size * __n;
|
|
char *__cptr = (char *) __ptr;
|
|
if (__cnt == 0)
|
|
return 0;
|
|
|
|
for (; __cnt > 0; --__cnt)
|
|
{
|
|
int __c = _IO_getc_unlocked (__stream);
|
|
if (__c == EOF)
|
|
break;
|
|
*__cptr++ = __c;
|
|
}
|
|
return (__cptr - (char *) __ptr) / __size;
|
|
}
|
|
# endif
|
|
return __fread_unlocked_alias (__ptr, __size, __n, __stream);
|
|
}
|
|
#endif
|