1998-11-12 18:03:43 +00:00
|
|
|
/* Optimizing macros and inline functions for stdio functions.
|
2016-01-04 16:05:18 +00:00
|
|
|
Copyright (C) 1998-2016 Free Software Foundation, Inc.
|
2001-07-06 04:58:11 +00:00
|
|
|
This file is part of the GNU C Library.
|
1998-11-12 18:03:43 +00:00
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00:00
|
|
|
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.
|
1998-11-12 18:03:43 +00:00
|
|
|
|
|
|
|
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
|
2001-07-06 04:58:11 +00:00
|
|
|
Lesser General Public License for more details.
|
1998-11-12 18:03:43 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
|
|
|
<http://www.gnu.org/licenses/>. */
|
1998-11-12 18:03:43 +00:00
|
|
|
|
|
|
|
#ifndef _STDIO_H
|
|
|
|
# error "Never include <bits/stdio.h> directly; use <stdio.h> instead."
|
|
|
|
#endif
|
|
|
|
|
* misc/sys/cdefs.h (__va_arg_pack): Define for GCC 4.3+.
* misc/bits/syslog.h (syslog): When __va_arg_pack is defined,
implement as __extern_always_inline function.
(vsyslog): Define as __extern_always_inline function unconditionally.
* libio/bits/stdio2.h (sprintf, snprintf, printf, fprintf):
When __va_arg_pack is defined, implement as __extern_always_inline
functions.
(vsprintf, vsnprintf, vprintf, vfprintf): Define as
__extern_always_inline functions unconditionally.
* libio/bits/stdio.h (vprintf): Ifdef out the inline when
bits/stdio2.h will be included.
* wcsmbs/bits/wchar2.h (__swprintf_alias): New redirect.
(swprintf, wprintf, fwprintf): When __va_arg_pack is defined,
implement as __extern_always_inline functions.
(vswprintf, vwprintf, vfwprintf): Define as
__extern_always_inline functions unconditionally.
* debug/tst-chk1.c (do_test): Enable remaining tests for C++.
2007-09-03 Jakub Jelinek <jakub@redhat.com>
* misc/sys/cdefs.h (__extern_inline, __extern_always_inline): Only
define in C++ for GCC 4.3+, in C++ always use __gnu_inline__
attribute.
* include/features.h (__USE_EXTERN_INLINES): Define only when
__extern_inline is defined.
* stdlib/stdlib.h: Include bits/stdlib.h when __extern_always_inline
is defined instead of when not __cplusplus.
* misc/sys/syslog.h: Include bits/syslog.h when __extern_always_inline
is defined instead of when not __cplusplus.
* socket/sys/socket.h: Include bits/socket2.h when
__extern_always_inline is defined instead of when not __cplusplus.
* libio/stdio.h: Include bits/stdio2.h when __extern_always_inline
is defined instead of when not __cplusplus.
* posix/unistd.h: Include bits/unistd.h when __extern_always_inline
is defined instead of when not __cplusplus.
* string/string.h: Include bits/string3.h when __extern_always_inline
is defined instead of when not __cplusplus.
* wcsmbs/wchar.h: Include bits/wchar2.h when __extern_always_inline
is defined instead of when not __cplusplus.
(btowc, wctob): Don't guard the inlines with ifndef __cplusplus.
* io/fcntl.h: Don't include bits/fcntl2.h if __extern_always_inline
is not defined.
* misc/bits/syslog-ldbl.h: Guard *_chk stuff with
defined __extern_always_inline instead of !defined __cplusplus.
* libio/bits/stdio-ldbl.h: Likewise.
* wcsmbs/bits/wchar-ldbl.h: Likewise.
* misc/bits/syslog.h (syslog): Don't define for C++.
(vsyslog): Use __extern_always_inline function for C++ instead of
a macro.
* libio/bits/stdio.h (__STDIO_INLINE): Define to __extern_inline
whenever that macro is defined.
(vprintf): Don't provide the inline for C++.
(fread_unlocked, fwrite_unlocked): Don't define the macros for C++.
* libio/bits/stdio2.h (sprintf, snprintf, printf, fprintf): Don't
define the macros for C++.
(vsprintf, vsnprintf, vprintf, vfprintf): Define as
__extern_always_inline functions for C++.
* io/sys/stat.h (stat, lstat, fstat, fstatat, mknod, mknodat,
stat64, lstat64, fstat64, fstatat64): Don't define if not
__USE_EXTERN_INLINES.
* wcsmbs/bits/wchar2.h: Fix #error message.
(swprintf, wprintf, fwprintf): Don't define the macros for C++.
(vswprintf, vwprintf, vfwprintf): Define using
__extern_always_inline functions for C++.
* string/bits/string3.h: Don't #undef macros if __cplusplus.
(memcpy, memmove, mempcpy, memset, bcopy, bzero, strcpy, stpcpy,
strncpy, strcat, strncat): Define as __extern_always_inline
functions instead of macros for C++.
* math/bits/cmathcalls.h: Guard __extern_inline routines with
defined __extern_inline.
* sysdeps/alpha/fpu/bits/mathinline.h (__MATH_INLINE): Define
to __extern_inline whenever that macro is defined.
* sysdeps/ia64/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/i386/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/i386/i486/bits/string.h (__STRING_INLINE): Likewise.
* sysdeps/s390/bits/string.h (__STRING_INLINE): Likewise.
* sysdeps/s390/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/powerpc/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/x86_64/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/sparc/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/unix/sysv/linux/sys/sysmacros.h (gnu_dev_major,
gnu_dev_minor, gnu_dev_makedev): Remove __extern_inline from
prototypes. Only provide __extern_inline routines if
__USE_EXTERN_INLINES.
* debug/Makefile: Add rules to build and run tst-{,lfs}chk{4,5,6}
tests.
* debug/tst-chk1.c (do_prepare, do_test): Allow compilation as C++.
For now avoid some *printf tests in C++. Skip all testing
if __USE_FORTIFY_LEVEL is defined, but __extern_always_inline macro
is not.
* debug/tst-chk4.cc: New file.
* debug/tst-chk5.cc: New file.
* debug/tst-chk6.cc: New file.
* debug/tst-lfschk4.cc: New file.
* debug/tst-lfschk5.cc: New file.
* debug/tst-lfschk6.cc: New file.
* include/wchar.h (__vfwprintf_chk, __vswprintf_chk): Avoid
prototypes in C++.
* include/stdio.h (__sprintf_chk, __snprintf_chk, __vsprintf_chk,
__vsnprintf_chk, __printf_chk, __fprintf_chk, __vprintf_chk,
__vfprintf_chk, __fgets_unlocked_chk, __fgets_chk): Likewise.
2007-09-15 02:38:04 +00:00
|
|
|
#ifndef __extern_inline
|
1998-11-12 18:03:43 +00:00
|
|
|
# define __STDIO_INLINE inline
|
|
|
|
#else
|
2007-03-17 17:04:28 +00:00
|
|
|
# define __STDIO_INLINE __extern_inline
|
1998-11-12 18:03:43 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef __USE_EXTERN_INLINES
|
* misc/sys/cdefs.h (__va_arg_pack): Define for GCC 4.3+.
* misc/bits/syslog.h (syslog): When __va_arg_pack is defined,
implement as __extern_always_inline function.
(vsyslog): Define as __extern_always_inline function unconditionally.
* libio/bits/stdio2.h (sprintf, snprintf, printf, fprintf):
When __va_arg_pack is defined, implement as __extern_always_inline
functions.
(vsprintf, vsnprintf, vprintf, vfprintf): Define as
__extern_always_inline functions unconditionally.
* libio/bits/stdio.h (vprintf): Ifdef out the inline when
bits/stdio2.h will be included.
* wcsmbs/bits/wchar2.h (__swprintf_alias): New redirect.
(swprintf, wprintf, fwprintf): When __va_arg_pack is defined,
implement as __extern_always_inline functions.
(vswprintf, vwprintf, vfwprintf): Define as
__extern_always_inline functions unconditionally.
* debug/tst-chk1.c (do_test): Enable remaining tests for C++.
2007-09-03 Jakub Jelinek <jakub@redhat.com>
* misc/sys/cdefs.h (__extern_inline, __extern_always_inline): Only
define in C++ for GCC 4.3+, in C++ always use __gnu_inline__
attribute.
* include/features.h (__USE_EXTERN_INLINES): Define only when
__extern_inline is defined.
* stdlib/stdlib.h: Include bits/stdlib.h when __extern_always_inline
is defined instead of when not __cplusplus.
* misc/sys/syslog.h: Include bits/syslog.h when __extern_always_inline
is defined instead of when not __cplusplus.
* socket/sys/socket.h: Include bits/socket2.h when
__extern_always_inline is defined instead of when not __cplusplus.
* libio/stdio.h: Include bits/stdio2.h when __extern_always_inline
is defined instead of when not __cplusplus.
* posix/unistd.h: Include bits/unistd.h when __extern_always_inline
is defined instead of when not __cplusplus.
* string/string.h: Include bits/string3.h when __extern_always_inline
is defined instead of when not __cplusplus.
* wcsmbs/wchar.h: Include bits/wchar2.h when __extern_always_inline
is defined instead of when not __cplusplus.
(btowc, wctob): Don't guard the inlines with ifndef __cplusplus.
* io/fcntl.h: Don't include bits/fcntl2.h if __extern_always_inline
is not defined.
* misc/bits/syslog-ldbl.h: Guard *_chk stuff with
defined __extern_always_inline instead of !defined __cplusplus.
* libio/bits/stdio-ldbl.h: Likewise.
* wcsmbs/bits/wchar-ldbl.h: Likewise.
* misc/bits/syslog.h (syslog): Don't define for C++.
(vsyslog): Use __extern_always_inline function for C++ instead of
a macro.
* libio/bits/stdio.h (__STDIO_INLINE): Define to __extern_inline
whenever that macro is defined.
(vprintf): Don't provide the inline for C++.
(fread_unlocked, fwrite_unlocked): Don't define the macros for C++.
* libio/bits/stdio2.h (sprintf, snprintf, printf, fprintf): Don't
define the macros for C++.
(vsprintf, vsnprintf, vprintf, vfprintf): Define as
__extern_always_inline functions for C++.
* io/sys/stat.h (stat, lstat, fstat, fstatat, mknod, mknodat,
stat64, lstat64, fstat64, fstatat64): Don't define if not
__USE_EXTERN_INLINES.
* wcsmbs/bits/wchar2.h: Fix #error message.
(swprintf, wprintf, fwprintf): Don't define the macros for C++.
(vswprintf, vwprintf, vfwprintf): Define using
__extern_always_inline functions for C++.
* string/bits/string3.h: Don't #undef macros if __cplusplus.
(memcpy, memmove, mempcpy, memset, bcopy, bzero, strcpy, stpcpy,
strncpy, strcat, strncat): Define as __extern_always_inline
functions instead of macros for C++.
* math/bits/cmathcalls.h: Guard __extern_inline routines with
defined __extern_inline.
* sysdeps/alpha/fpu/bits/mathinline.h (__MATH_INLINE): Define
to __extern_inline whenever that macro is defined.
* sysdeps/ia64/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/i386/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/i386/i486/bits/string.h (__STRING_INLINE): Likewise.
* sysdeps/s390/bits/string.h (__STRING_INLINE): Likewise.
* sysdeps/s390/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/powerpc/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/x86_64/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/sparc/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/unix/sysv/linux/sys/sysmacros.h (gnu_dev_major,
gnu_dev_minor, gnu_dev_makedev): Remove __extern_inline from
prototypes. Only provide __extern_inline routines if
__USE_EXTERN_INLINES.
* debug/Makefile: Add rules to build and run tst-{,lfs}chk{4,5,6}
tests.
* debug/tst-chk1.c (do_prepare, do_test): Allow compilation as C++.
For now avoid some *printf tests in C++. Skip all testing
if __USE_FORTIFY_LEVEL is defined, but __extern_always_inline macro
is not.
* debug/tst-chk4.cc: New file.
* debug/tst-chk5.cc: New file.
* debug/tst-chk6.cc: New file.
* debug/tst-lfschk4.cc: New file.
* debug/tst-lfschk5.cc: New file.
* debug/tst-lfschk6.cc: New file.
* include/wchar.h (__vfwprintf_chk, __vswprintf_chk): Avoid
prototypes in C++.
* include/stdio.h (__sprintf_chk, __snprintf_chk, __vsprintf_chk,
__vsnprintf_chk, __printf_chk, __fprintf_chk, __vprintf_chk,
__vfprintf_chk, __fgets_unlocked_chk, __fgets_chk): Likewise.
2007-09-15 02:38:04 +00:00
|
|
|
/* For -D_FORTIFY_SOURCE{,=2} bits/stdio2.h will define a different
|
|
|
|
inline. */
|
2012-04-29 13:34:20 +00:00
|
|
|
# if !(__USE_FORTIFY_LEVEL > 0 && defined __fortify_function)
|
1998-11-12 18:03:43 +00:00
|
|
|
/* Write formatted output to stdout from argument list ARG. */
|
|
|
|
__STDIO_INLINE int
|
2012-01-08 04:57:22 +00:00
|
|
|
vprintf (const char *__restrict __fmt, _G_va_list __arg)
|
1998-11-12 18:03:43 +00:00
|
|
|
{
|
|
|
|
return vfprintf (stdout, __fmt, __arg);
|
|
|
|
}
|
* misc/sys/cdefs.h (__va_arg_pack): Define for GCC 4.3+.
* misc/bits/syslog.h (syslog): When __va_arg_pack is defined,
implement as __extern_always_inline function.
(vsyslog): Define as __extern_always_inline function unconditionally.
* libio/bits/stdio2.h (sprintf, snprintf, printf, fprintf):
When __va_arg_pack is defined, implement as __extern_always_inline
functions.
(vsprintf, vsnprintf, vprintf, vfprintf): Define as
__extern_always_inline functions unconditionally.
* libio/bits/stdio.h (vprintf): Ifdef out the inline when
bits/stdio2.h will be included.
* wcsmbs/bits/wchar2.h (__swprintf_alias): New redirect.
(swprintf, wprintf, fwprintf): When __va_arg_pack is defined,
implement as __extern_always_inline functions.
(vswprintf, vwprintf, vfwprintf): Define as
__extern_always_inline functions unconditionally.
* debug/tst-chk1.c (do_test): Enable remaining tests for C++.
2007-09-03 Jakub Jelinek <jakub@redhat.com>
* misc/sys/cdefs.h (__extern_inline, __extern_always_inline): Only
define in C++ for GCC 4.3+, in C++ always use __gnu_inline__
attribute.
* include/features.h (__USE_EXTERN_INLINES): Define only when
__extern_inline is defined.
* stdlib/stdlib.h: Include bits/stdlib.h when __extern_always_inline
is defined instead of when not __cplusplus.
* misc/sys/syslog.h: Include bits/syslog.h when __extern_always_inline
is defined instead of when not __cplusplus.
* socket/sys/socket.h: Include bits/socket2.h when
__extern_always_inline is defined instead of when not __cplusplus.
* libio/stdio.h: Include bits/stdio2.h when __extern_always_inline
is defined instead of when not __cplusplus.
* posix/unistd.h: Include bits/unistd.h when __extern_always_inline
is defined instead of when not __cplusplus.
* string/string.h: Include bits/string3.h when __extern_always_inline
is defined instead of when not __cplusplus.
* wcsmbs/wchar.h: Include bits/wchar2.h when __extern_always_inline
is defined instead of when not __cplusplus.
(btowc, wctob): Don't guard the inlines with ifndef __cplusplus.
* io/fcntl.h: Don't include bits/fcntl2.h if __extern_always_inline
is not defined.
* misc/bits/syslog-ldbl.h: Guard *_chk stuff with
defined __extern_always_inline instead of !defined __cplusplus.
* libio/bits/stdio-ldbl.h: Likewise.
* wcsmbs/bits/wchar-ldbl.h: Likewise.
* misc/bits/syslog.h (syslog): Don't define for C++.
(vsyslog): Use __extern_always_inline function for C++ instead of
a macro.
* libio/bits/stdio.h (__STDIO_INLINE): Define to __extern_inline
whenever that macro is defined.
(vprintf): Don't provide the inline for C++.
(fread_unlocked, fwrite_unlocked): Don't define the macros for C++.
* libio/bits/stdio2.h (sprintf, snprintf, printf, fprintf): Don't
define the macros for C++.
(vsprintf, vsnprintf, vprintf, vfprintf): Define as
__extern_always_inline functions for C++.
* io/sys/stat.h (stat, lstat, fstat, fstatat, mknod, mknodat,
stat64, lstat64, fstat64, fstatat64): Don't define if not
__USE_EXTERN_INLINES.
* wcsmbs/bits/wchar2.h: Fix #error message.
(swprintf, wprintf, fwprintf): Don't define the macros for C++.
(vswprintf, vwprintf, vfwprintf): Define using
__extern_always_inline functions for C++.
* string/bits/string3.h: Don't #undef macros if __cplusplus.
(memcpy, memmove, mempcpy, memset, bcopy, bzero, strcpy, stpcpy,
strncpy, strcat, strncat): Define as __extern_always_inline
functions instead of macros for C++.
* math/bits/cmathcalls.h: Guard __extern_inline routines with
defined __extern_inline.
* sysdeps/alpha/fpu/bits/mathinline.h (__MATH_INLINE): Define
to __extern_inline whenever that macro is defined.
* sysdeps/ia64/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/i386/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/i386/i486/bits/string.h (__STRING_INLINE): Likewise.
* sysdeps/s390/bits/string.h (__STRING_INLINE): Likewise.
* sysdeps/s390/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/powerpc/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/x86_64/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/sparc/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/unix/sysv/linux/sys/sysmacros.h (gnu_dev_major,
gnu_dev_minor, gnu_dev_makedev): Remove __extern_inline from
prototypes. Only provide __extern_inline routines if
__USE_EXTERN_INLINES.
* debug/Makefile: Add rules to build and run tst-{,lfs}chk{4,5,6}
tests.
* debug/tst-chk1.c (do_prepare, do_test): Allow compilation as C++.
For now avoid some *printf tests in C++. Skip all testing
if __USE_FORTIFY_LEVEL is defined, but __extern_always_inline macro
is not.
* debug/tst-chk4.cc: New file.
* debug/tst-chk5.cc: New file.
* debug/tst-chk6.cc: New file.
* debug/tst-lfschk4.cc: New file.
* debug/tst-lfschk5.cc: New file.
* debug/tst-lfschk6.cc: New file.
* include/wchar.h (__vfwprintf_chk, __vswprintf_chk): Avoid
prototypes in C++.
* include/stdio.h (__sprintf_chk, __snprintf_chk, __vsprintf_chk,
__vsnprintf_chk, __printf_chk, __fprintf_chk, __vprintf_chk,
__vfprintf_chk, __fgets_unlocked_chk, __fgets_chk): Likewise.
2007-09-15 02:38:04 +00:00
|
|
|
# endif
|
1998-11-12 18:03:43 +00:00
|
|
|
|
|
|
|
/* Read a character from stdin. */
|
|
|
|
__STDIO_INLINE int
|
2003-05-10 08:39:58 +00:00
|
|
|
getchar (void)
|
1998-11-12 18:03:43 +00:00
|
|
|
{
|
|
|
|
return _IO_getc (stdin);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-04-25 14:35:54 +00:00
|
|
|
# ifdef __USE_MISC
|
|
|
|
/* Faster version when locking is not necessary. */
|
|
|
|
__STDIO_INLINE int
|
|
|
|
fgetc_unlocked (FILE *__fp)
|
|
|
|
{
|
|
|
|
return _IO_getc_unlocked (__fp);
|
|
|
|
}
|
|
|
|
# endif /* misc */
|
|
|
|
|
|
|
|
|
2014-02-21 21:45:26 +00:00
|
|
|
# ifdef __USE_POSIX
|
1998-11-12 18:03:43 +00:00
|
|
|
/* This is defined in POSIX.1:1996. */
|
|
|
|
__STDIO_INLINE int
|
2003-05-10 08:39:58 +00:00
|
|
|
getc_unlocked (FILE *__fp)
|
1998-11-12 18:03:43 +00:00
|
|
|
{
|
|
|
|
return _IO_getc_unlocked (__fp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is defined in POSIX.1:1996. */
|
|
|
|
__STDIO_INLINE int
|
2003-05-10 08:39:58 +00:00
|
|
|
getchar_unlocked (void)
|
1998-11-12 18:03:43 +00:00
|
|
|
{
|
|
|
|
return _IO_getc_unlocked (stdin);
|
|
|
|
}
|
2014-02-21 21:45:26 +00:00
|
|
|
# endif /* POSIX */
|
1998-11-12 18:03:43 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* Write a character to stdout. */
|
|
|
|
__STDIO_INLINE int
|
2003-05-10 08:39:58 +00:00
|
|
|
putchar (int __c)
|
1998-11-12 18:03:43 +00:00
|
|
|
{
|
|
|
|
return _IO_putc (__c, stdout);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
# ifdef __USE_MISC
|
|
|
|
/* Faster version when locking is not necessary. */
|
|
|
|
__STDIO_INLINE int
|
2003-05-10 08:39:58 +00:00
|
|
|
fputc_unlocked (int __c, FILE *__stream)
|
1998-11-12 18:03:43 +00:00
|
|
|
{
|
|
|
|
return _IO_putc_unlocked (__c, __stream);
|
|
|
|
}
|
|
|
|
# endif /* misc */
|
|
|
|
|
|
|
|
|
2014-02-21 21:45:26 +00:00
|
|
|
# ifdef __USE_POSIX
|
1998-11-12 18:03:43 +00:00
|
|
|
/* This is defined in POSIX.1:1996. */
|
|
|
|
__STDIO_INLINE int
|
2003-05-10 08:39:58 +00:00
|
|
|
putc_unlocked (int __c, FILE *__stream)
|
1998-11-12 18:03:43 +00:00
|
|
|
{
|
|
|
|
return _IO_putc_unlocked (__c, __stream);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is defined in POSIX.1:1996. */
|
|
|
|
__STDIO_INLINE int
|
2003-05-10 08:39:58 +00:00
|
|
|
putchar_unlocked (int __c)
|
1998-11-12 18:03:43 +00:00
|
|
|
{
|
|
|
|
return _IO_putc_unlocked (__c, stdout);
|
|
|
|
}
|
2014-02-21 21:45:26 +00:00
|
|
|
# endif /* POSIX */
|
1998-11-12 18:03:43 +00:00
|
|
|
|
|
|
|
|
|
|
|
# ifdef __USE_GNU
|
|
|
|
/* Like `getdelim', but reads up to a newline. */
|
|
|
|
__STDIO_INLINE _IO_ssize_t
|
2003-05-10 08:39:58 +00:00
|
|
|
getline (char **__lineptr, size_t *__n, FILE *__stream)
|
1998-11-12 18:03:43 +00:00
|
|
|
{
|
|
|
|
return __getdelim (__lineptr, __n, '\n', __stream);
|
|
|
|
}
|
|
|
|
# endif /* GNU */
|
|
|
|
|
|
|
|
|
|
|
|
# ifdef __USE_MISC
|
|
|
|
/* Faster versions when locking is not required. */
|
|
|
|
__STDIO_INLINE int
|
2004-09-07 22:33:37 +00:00
|
|
|
__NTH (feof_unlocked (FILE *__stream))
|
1998-11-12 18:03:43 +00:00
|
|
|
{
|
|
|
|
return _IO_feof_unlocked (__stream);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Faster versions when locking is not required. */
|
|
|
|
__STDIO_INLINE int
|
2004-09-07 22:33:37 +00:00
|
|
|
__NTH (ferror_unlocked (FILE *__stream))
|
1998-11-12 18:03:43 +00:00
|
|
|
{
|
|
|
|
return _IO_ferror_unlocked (__stream);
|
|
|
|
}
|
|
|
|
# endif /* misc */
|
|
|
|
|
|
|
|
#endif /* Use extern inlines. */
|
|
|
|
|
|
|
|
|
* misc/sys/cdefs.h (__va_arg_pack): Define for GCC 4.3+.
* misc/bits/syslog.h (syslog): When __va_arg_pack is defined,
implement as __extern_always_inline function.
(vsyslog): Define as __extern_always_inline function unconditionally.
* libio/bits/stdio2.h (sprintf, snprintf, printf, fprintf):
When __va_arg_pack is defined, implement as __extern_always_inline
functions.
(vsprintf, vsnprintf, vprintf, vfprintf): Define as
__extern_always_inline functions unconditionally.
* libio/bits/stdio.h (vprintf): Ifdef out the inline when
bits/stdio2.h will be included.
* wcsmbs/bits/wchar2.h (__swprintf_alias): New redirect.
(swprintf, wprintf, fwprintf): When __va_arg_pack is defined,
implement as __extern_always_inline functions.
(vswprintf, vwprintf, vfwprintf): Define as
__extern_always_inline functions unconditionally.
* debug/tst-chk1.c (do_test): Enable remaining tests for C++.
2007-09-03 Jakub Jelinek <jakub@redhat.com>
* misc/sys/cdefs.h (__extern_inline, __extern_always_inline): Only
define in C++ for GCC 4.3+, in C++ always use __gnu_inline__
attribute.
* include/features.h (__USE_EXTERN_INLINES): Define only when
__extern_inline is defined.
* stdlib/stdlib.h: Include bits/stdlib.h when __extern_always_inline
is defined instead of when not __cplusplus.
* misc/sys/syslog.h: Include bits/syslog.h when __extern_always_inline
is defined instead of when not __cplusplus.
* socket/sys/socket.h: Include bits/socket2.h when
__extern_always_inline is defined instead of when not __cplusplus.
* libio/stdio.h: Include bits/stdio2.h when __extern_always_inline
is defined instead of when not __cplusplus.
* posix/unistd.h: Include bits/unistd.h when __extern_always_inline
is defined instead of when not __cplusplus.
* string/string.h: Include bits/string3.h when __extern_always_inline
is defined instead of when not __cplusplus.
* wcsmbs/wchar.h: Include bits/wchar2.h when __extern_always_inline
is defined instead of when not __cplusplus.
(btowc, wctob): Don't guard the inlines with ifndef __cplusplus.
* io/fcntl.h: Don't include bits/fcntl2.h if __extern_always_inline
is not defined.
* misc/bits/syslog-ldbl.h: Guard *_chk stuff with
defined __extern_always_inline instead of !defined __cplusplus.
* libio/bits/stdio-ldbl.h: Likewise.
* wcsmbs/bits/wchar-ldbl.h: Likewise.
* misc/bits/syslog.h (syslog): Don't define for C++.
(vsyslog): Use __extern_always_inline function for C++ instead of
a macro.
* libio/bits/stdio.h (__STDIO_INLINE): Define to __extern_inline
whenever that macro is defined.
(vprintf): Don't provide the inline for C++.
(fread_unlocked, fwrite_unlocked): Don't define the macros for C++.
* libio/bits/stdio2.h (sprintf, snprintf, printf, fprintf): Don't
define the macros for C++.
(vsprintf, vsnprintf, vprintf, vfprintf): Define as
__extern_always_inline functions for C++.
* io/sys/stat.h (stat, lstat, fstat, fstatat, mknod, mknodat,
stat64, lstat64, fstat64, fstatat64): Don't define if not
__USE_EXTERN_INLINES.
* wcsmbs/bits/wchar2.h: Fix #error message.
(swprintf, wprintf, fwprintf): Don't define the macros for C++.
(vswprintf, vwprintf, vfwprintf): Define using
__extern_always_inline functions for C++.
* string/bits/string3.h: Don't #undef macros if __cplusplus.
(memcpy, memmove, mempcpy, memset, bcopy, bzero, strcpy, stpcpy,
strncpy, strcat, strncat): Define as __extern_always_inline
functions instead of macros for C++.
* math/bits/cmathcalls.h: Guard __extern_inline routines with
defined __extern_inline.
* sysdeps/alpha/fpu/bits/mathinline.h (__MATH_INLINE): Define
to __extern_inline whenever that macro is defined.
* sysdeps/ia64/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/i386/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/i386/i486/bits/string.h (__STRING_INLINE): Likewise.
* sysdeps/s390/bits/string.h (__STRING_INLINE): Likewise.
* sysdeps/s390/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/powerpc/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/x86_64/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/sparc/fpu/bits/mathinline.h (__MATH_INLINE): Likewise.
* sysdeps/unix/sysv/linux/sys/sysmacros.h (gnu_dev_major,
gnu_dev_minor, gnu_dev_makedev): Remove __extern_inline from
prototypes. Only provide __extern_inline routines if
__USE_EXTERN_INLINES.
* debug/Makefile: Add rules to build and run tst-{,lfs}chk{4,5,6}
tests.
* debug/tst-chk1.c (do_prepare, do_test): Allow compilation as C++.
For now avoid some *printf tests in C++. Skip all testing
if __USE_FORTIFY_LEVEL is defined, but __extern_always_inline macro
is not.
* debug/tst-chk4.cc: New file.
* debug/tst-chk5.cc: New file.
* debug/tst-chk6.cc: New file.
* debug/tst-lfschk4.cc: New file.
* debug/tst-lfschk5.cc: New file.
* debug/tst-lfschk6.cc: New file.
* include/wchar.h (__vfwprintf_chk, __vswprintf_chk): Avoid
prototypes in C++.
* include/stdio.h (__sprintf_chk, __snprintf_chk, __vsprintf_chk,
__vsnprintf_chk, __printf_chk, __fprintf_chk, __vprintf_chk,
__vfprintf_chk, __fgets_unlocked_chk, __fgets_chk): Likewise.
2007-09-15 02:38:04 +00:00
|
|
|
#if defined __USE_MISC && defined __GNUC__ && defined __OPTIMIZE__ \
|
|
|
|
&& !defined __cplusplus
|
1998-11-12 18:03:43 +00:00
|
|
|
/* Perform some simple optimizations. */
|
|
|
|
# define fread_unlocked(ptr, size, n, stream) \
|
1998-11-16 12:02:08 +00:00
|
|
|
(__extension__ ((__builtin_constant_p (size) && __builtin_constant_p (n) \
|
2004-08-10 04:38:50 +00:00
|
|
|
&& (size_t) (size) * (size_t) (n) <= 8 \
|
|
|
|
&& (size_t) (size) != 0) \
|
1998-11-12 18:03:43 +00:00
|
|
|
? ({ char *__ptr = (char *) (ptr); \
|
|
|
|
FILE *__stream = (stream); \
|
1998-11-16 12:02:08 +00:00
|
|
|
size_t __cnt; \
|
2004-08-10 04:38:50 +00:00
|
|
|
for (__cnt = (size_t) (size) * (size_t) (n); \
|
|
|
|
__cnt > 0; --__cnt) \
|
1998-11-12 18:03:43 +00:00
|
|
|
{ \
|
1998-11-13 13:21:56 +00:00
|
|
|
int __c = _IO_getc_unlocked (__stream); \
|
1998-11-12 18:03:43 +00:00
|
|
|
if (__c == EOF) \
|
1998-11-16 12:02:08 +00:00
|
|
|
break; \
|
1998-11-12 18:03:43 +00:00
|
|
|
*__ptr++ = __c; \
|
|
|
|
} \
|
2004-08-10 04:38:50 +00:00
|
|
|
((size_t) (size) * (size_t) (n) - __cnt) \
|
|
|
|
/ (size_t) (size); }) \
|
|
|
|
: (((__builtin_constant_p (size) && (size_t) (size) == 0) \
|
|
|
|
|| (__builtin_constant_p (n) && (size_t) (n) == 0)) \
|
1998-11-16 12:02:08 +00:00
|
|
|
/* Evaluate all parameters once. */ \
|
|
|
|
? ((void) (ptr), (void) (stream), (void) (size), \
|
2004-08-10 18:01:40 +00:00
|
|
|
(void) (n), (size_t) 0) \
|
1998-11-16 12:02:08 +00:00
|
|
|
: fread_unlocked (ptr, size, n, stream))))
|
1998-11-12 18:03:43 +00:00
|
|
|
|
|
|
|
# define fwrite_unlocked(ptr, size, n, stream) \
|
1998-11-16 12:02:08 +00:00
|
|
|
(__extension__ ((__builtin_constant_p (size) && __builtin_constant_p (n) \
|
2004-08-10 18:01:40 +00:00
|
|
|
&& (size_t) (size) * (size_t) (n) <= 8 \
|
|
|
|
&& (size_t) (size) != 0) \
|
1998-11-12 18:03:43 +00:00
|
|
|
? ({ const char *__ptr = (const char *) (ptr); \
|
|
|
|
FILE *__stream = (stream); \
|
1998-11-16 12:02:08 +00:00
|
|
|
size_t __cnt; \
|
2004-08-10 04:38:50 +00:00
|
|
|
for (__cnt = (size_t) (size) * (size_t) (n); \
|
|
|
|
__cnt > 0; --__cnt) \
|
1998-11-12 18:03:43 +00:00
|
|
|
if (_IO_putc_unlocked (*__ptr++, __stream) == EOF) \
|
1998-11-16 12:02:08 +00:00
|
|
|
break; \
|
2004-08-10 04:38:50 +00:00
|
|
|
((size_t) (size) * (size_t) (n) - __cnt) \
|
|
|
|
/ (size_t) (size); }) \
|
|
|
|
: (((__builtin_constant_p (size) && (size_t) (size) == 0) \
|
|
|
|
|| (__builtin_constant_p (n) && (size_t) (n) == 0)) \
|
1998-11-16 12:02:08 +00:00
|
|
|
/* Evaluate all parameters once. */ \
|
2004-08-10 04:38:50 +00:00
|
|
|
? ((void) (ptr), (void) (stream), (void) (size), \
|
2004-08-10 18:01:40 +00:00
|
|
|
(void) (n), (size_t) 0) \
|
1998-11-16 12:02:08 +00:00
|
|
|
: fwrite_unlocked (ptr, size, n, stream))))
|
1998-11-12 18:03:43 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Define helper macro. */
|
|
|
|
#undef __STDIO_INLINE
|