mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 03:10:05 +00:00
de1c3ebb59
* 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.
148 lines
5.3 KiB
C
148 lines
5.3 KiB
C
#ifndef _STDIO_H
|
|
# if defined __need_FILE || defined __need___FILE
|
|
# include <libio/stdio.h>
|
|
# else
|
|
# include <libio/stdio.h>
|
|
|
|
/* Now define the internal interfaces. */
|
|
extern int __fcloseall (void);
|
|
extern int __snprintf (char *__restrict __s, size_t __maxlen,
|
|
__const char *__restrict __format, ...)
|
|
__attribute__ ((__format__ (__printf__, 3, 4)));
|
|
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);
|
|
#endif
|
|
|
|
/* Prototypes for compatibility functions. */
|
|
extern FILE *__new_tmpfile (void);
|
|
extern FILE *__old_tmpfile (void);
|
|
|
|
|
|
|
|
# define __need_size_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 __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));
|
|
|
|
/* 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 __const char *__const _sys_errlist_internal[] attribute_hidden;
|
|
extern int _sys_nerr_internal attribute_hidden;
|
|
|
|
extern int __asprintf_internal (char **__restrict __ptr,
|
|
__const char *__restrict __fmt, ...)
|
|
attribute_hidden __attribute__ ((__format__ (__printf__, 2, 3)));
|
|
# if !defined NOT_IN_libc && !defined _ISOMAC
|
|
# define __asprintf(ptr, fmt, args...) \
|
|
INTUSE(__asprintf) (ptr, fmt, ##args)
|
|
|
|
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)
|
|
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)
|
|
libc_hidden_proto (fwrite)
|
|
libc_hidden_proto (fseek)
|
|
libc_hidden_proto (fflush_unlocked)
|
|
libc_hidden_proto (fread_unlocked)
|
|
libc_hidden_proto (fwrite_unlocked)
|
|
libc_hidden_proto (fgets_unlocked)
|
|
libc_hidden_proto (fputs_unlocked)
|
|
libc_hidden_proto (open_memstream)
|
|
libc_hidden_proto (__libc_fatal)
|
|
libc_hidden_proto (__vsprintf_chk)
|
|
libc_hidden_proto (__vsnprintf_chk)
|
|
libc_hidden_proto (__vfprintf_chk)
|
|
|
|
# if !defined NOT_IN_libc && defined SHARED && defined DO_VERSIONING \
|
|
&& !defined NO_HIDDEN
|
|
/* Special gcc builtins. */
|
|
extern size_t __builtin_fwrite (const void *, size_t, size_t, void *)
|
|
__asm ("__GI_fwrite");
|
|
extern size_t __builtin_fwrite_unlocked (const void *, size_t, size_t, void *)
|
|
__asm ("__GI_fwrite_unlocked");
|
|
|
|
# endif
|
|
|
|
# endif
|
|
|
|
#endif
|