mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 00:31:08 +00:00
88764ae26a
2005-03-10 Jakub Jelinek <jakub@redhat.com> * math/test-misc.c (main): Add some more tests. 2005-03-17 Jakub Jelinek <jakub@redhat.com> * posix/regcomp.c (re_compile_fastmap_iter): Fix check for failed __wcrtomb. Check return values of other __wcrtomb calls. * posix/regex_internal.c (build_wcs_buffer, re_string_skip_chars): Change mbclen type to size_t. (build_wcs_upper_buffer): Change mbclen and mbcdlen type to size_t. Handle mb chars whose upper case doesn't have multibyte representation in locale's charset. 2005-03-15 Jakub Jelinek <jakub@redhat.com> * malloc/malloc.c (_int_icalloc, _int_icomalloc, iALLOc, public_iCALLOc, public_iCALLOc, public_iCOMALLOc): Protect with #ifndef _LIBC. [BZ #779] * malloc/malloc.c (public_mTRIm): Initialize malloc if not yet initialized. 2005-03-10 Jakub Jelinek <jakub@redhat.com> * misc/sys/cdefs.h (__always_inline): Define. * posix/bits/unistd.h (read, pread, pread64, readlink, getcwd, getwd): Use __always_inline instead of __inline. * socket/bits/socket2.h (recv, recvfrom): Likewise. * libio/bits/stdio2.h (gets, fgets, fgets_unlocked): Likewise. * string/bits/string3.h (__memcpy_ichk, __memmove_ichk, __mempcpy_ichk, __memset_ichk, __strcpy_ichk, __stpcpy_ichk, __strncpy_ichk, __strcat_ichk, __strncat_ichk): Use __always_inline instead of __inline__ __attribute__ ((__always_inline__)). 2005-03-09 Jakub Jelinek <jakub@redhat.com> * debug/tst-chk1.c: Include sys/socket.h and sys/un.h. (do_test): Add new tests for recv, recvfrom, getcwd, getwd and readlink. Add some more tests for read, pread, pread64, fgets and fgets_unlocked. * posix/bits/unistd.h (read, pread, pread64, readlink, getcwd, getwd): Change macros into extern inline functions. (__read_alias, __pread_alias, __pread64_alias, __readlink_alias, __getcwd_alias, __getwd_alias): New prototypes. * socket/bits/socket2.h (recv, recvfrom): Change macros into extern inline functions. (__recv_alias, __recvfrom_alias): New prototypes. * libio/bits/stdio2.h (gets, fgets, fgets_unlocked): Change macros into extern inline functions. (__gets_alias, __fgets_alias, __fgets_unlocked_alias): New prototypes. * debug/pread_chk.c (__pread_chk): Fix order of arguments passed to __pread. * debug/pread64_chk.c (__pread64_chk): Fix order of arguments passed to __pread64.
117 lines
4.3 KiB
C
117 lines
4.3 KiB
C
/* Checking macros for stdio functions.
|
|
Copyright (C) 2004, 2005 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, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#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;
|
|
|
|
#define sprintf(str, ...) \
|
|
__builtin___sprintf_chk (str, __USE_FORTIFY_LEVEL - 1, __bos (str), \
|
|
__VA_ARGS__)
|
|
#define vsprintf(str, fmt, ap) \
|
|
__builtin___vsprintf_chk (str, __USE_FORTIFY_LEVEL - 1, __bos (str), fmt, ap)
|
|
|
|
#if defined __USE_BSD || 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;
|
|
|
|
# define snprintf(str, len, ...) \
|
|
__builtin___snprintf_chk (str, len, __USE_FORTIFY_LEVEL - 1, __bos (str), \
|
|
__VA_ARGS__)
|
|
# define vsnprintf(str, len, fmt, ap) \
|
|
__builtin___vsnprintf_chk (str, len, __USE_FORTIFY_LEVEL - 1, __bos (str), \
|
|
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);
|
|
|
|
# define printf(...) \
|
|
__printf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
|
|
# define fprintf(stream, ...) \
|
|
__fprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
|
|
# define vprintf(format, ap) \
|
|
__vprintf_chk (__USE_FORTIFY_LEVEL - 1, format, ap)
|
|
# define vfprintf(stream, format, ap) \
|
|
__vfprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, format, ap)
|
|
|
|
#endif
|
|
|
|
extern char *__gets_chk (char *__str, size_t) __wur;
|
|
extern char *__REDIRECT (__gets_alias, (char *__str), gets) __wur;
|
|
|
|
extern __always_inline __wur char *
|
|
gets (char *__str)
|
|
{
|
|
if (__bos (__str) != (size_t) -1)
|
|
return __gets_chk (__str, __bos (__str));
|
|
return __gets_alias (__str);
|
|
}
|
|
|
|
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 __always_inline __wur char *
|
|
fgets (char *__restrict __s, int __n, FILE *__restrict __stream)
|
|
{
|
|
if (__bos (__s) != (size_t) -1
|
|
&& (!__builtin_constant_p (__n) || (size_t) __n > __bos (__s)))
|
|
return __fgets_chk (__s, __bos (__s), __n, __stream);
|
|
return __fgets_alias (__s, __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 __always_inline __wur char *
|
|
fgets_unlocked (char *__restrict __s, int __n, FILE *__restrict __stream)
|
|
{
|
|
if (__bos (__s) != (size_t) -1
|
|
&& (!__builtin_constant_p (__n) || (size_t) __n > __bos (__s)))
|
|
return __fgets_unlocked_chk (__s, __bos (__s), __n, __stream);
|
|
return __fgets_unlocked_alias (__s, __n, __stream);
|
|
}
|
|
#endif
|