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.
216 lines
7.5 KiB
C
216 lines
7.5 KiB
C
/*
|
|
* Copyright (c) 1982, 1986, 1988, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* @(#)syslog.h 8.1 (Berkeley) 6/2/93
|
|
*/
|
|
|
|
#ifndef _SYS_SYSLOG_H
|
|
#define _SYS_SYSLOG_H 1
|
|
|
|
#include <features.h>
|
|
#define __need___va_list
|
|
#include <stdarg.h>
|
|
|
|
/* This file defines _PATH_LOG. */
|
|
#include <bits/syslog-path.h>
|
|
|
|
/*
|
|
* priorities/facilities are encoded into a single 32-bit quantity, where the
|
|
* bottom 3 bits are the priority (0-7) and the top 28 bits are the facility
|
|
* (0-big number). Both the priorities and the facilities map roughly
|
|
* one-to-one to strings in the syslogd(8) source code. This mapping is
|
|
* included in this file.
|
|
*
|
|
* priorities (these are ordered)
|
|
*/
|
|
#define LOG_EMERG 0 /* system is unusable */
|
|
#define LOG_ALERT 1 /* action must be taken immediately */
|
|
#define LOG_CRIT 2 /* critical conditions */
|
|
#define LOG_ERR 3 /* error conditions */
|
|
#define LOG_WARNING 4 /* warning conditions */
|
|
#define LOG_NOTICE 5 /* normal but significant condition */
|
|
#define LOG_INFO 6 /* informational */
|
|
#define LOG_DEBUG 7 /* debug-level messages */
|
|
|
|
#define LOG_PRIMASK 0x07 /* mask to extract priority part (internal) */
|
|
/* extract priority */
|
|
#define LOG_PRI(p) ((p) & LOG_PRIMASK)
|
|
#define LOG_MAKEPRI(fac, pri) (((fac) << 3) | (pri))
|
|
|
|
#ifdef SYSLOG_NAMES
|
|
#define INTERNAL_NOPRI 0x10 /* the "no priority" priority */
|
|
/* mark "facility" */
|
|
#define INTERNAL_MARK LOG_MAKEPRI(LOG_NFACILITIES, 0)
|
|
typedef struct _code {
|
|
char *c_name;
|
|
int c_val;
|
|
} CODE;
|
|
|
|
CODE prioritynames[] =
|
|
{
|
|
{ "alert", LOG_ALERT },
|
|
{ "crit", LOG_CRIT },
|
|
{ "debug", LOG_DEBUG },
|
|
{ "emerg", LOG_EMERG },
|
|
{ "err", LOG_ERR },
|
|
{ "error", LOG_ERR }, /* DEPRECATED */
|
|
{ "info", LOG_INFO },
|
|
{ "none", INTERNAL_NOPRI }, /* INTERNAL */
|
|
{ "notice", LOG_NOTICE },
|
|
{ "panic", LOG_EMERG }, /* DEPRECATED */
|
|
{ "warn", LOG_WARNING }, /* DEPRECATED */
|
|
{ "warning", LOG_WARNING },
|
|
{ NULL, -1 }
|
|
};
|
|
#endif
|
|
|
|
/* facility codes */
|
|
#define LOG_KERN (0<<3) /* kernel messages */
|
|
#define LOG_USER (1<<3) /* random user-level messages */
|
|
#define LOG_MAIL (2<<3) /* mail system */
|
|
#define LOG_DAEMON (3<<3) /* system daemons */
|
|
#define LOG_AUTH (4<<3) /* security/authorization messages */
|
|
#define LOG_SYSLOG (5<<3) /* messages generated internally by syslogd */
|
|
#define LOG_LPR (6<<3) /* line printer subsystem */
|
|
#define LOG_NEWS (7<<3) /* network news subsystem */
|
|
#define LOG_UUCP (8<<3) /* UUCP subsystem */
|
|
#define LOG_CRON (9<<3) /* clock daemon */
|
|
#define LOG_AUTHPRIV (10<<3) /* security/authorization messages (private) */
|
|
#define LOG_FTP (11<<3) /* ftp daemon */
|
|
|
|
/* other codes through 15 reserved for system use */
|
|
#define LOG_LOCAL0 (16<<3) /* reserved for local use */
|
|
#define LOG_LOCAL1 (17<<3) /* reserved for local use */
|
|
#define LOG_LOCAL2 (18<<3) /* reserved for local use */
|
|
#define LOG_LOCAL3 (19<<3) /* reserved for local use */
|
|
#define LOG_LOCAL4 (20<<3) /* reserved for local use */
|
|
#define LOG_LOCAL5 (21<<3) /* reserved for local use */
|
|
#define LOG_LOCAL6 (22<<3) /* reserved for local use */
|
|
#define LOG_LOCAL7 (23<<3) /* reserved for local use */
|
|
|
|
#define LOG_NFACILITIES 24 /* current number of facilities */
|
|
#define LOG_FACMASK 0x03f8 /* mask to extract facility part */
|
|
/* facility of pri */
|
|
#define LOG_FAC(p) (((p) & LOG_FACMASK) >> 3)
|
|
|
|
#ifdef SYSLOG_NAMES
|
|
CODE facilitynames[] =
|
|
{
|
|
{ "auth", LOG_AUTH },
|
|
{ "authpriv", LOG_AUTHPRIV },
|
|
{ "cron", LOG_CRON },
|
|
{ "daemon", LOG_DAEMON },
|
|
{ "ftp", LOG_FTP },
|
|
{ "kern", LOG_KERN },
|
|
{ "lpr", LOG_LPR },
|
|
{ "mail", LOG_MAIL },
|
|
{ "mark", INTERNAL_MARK }, /* INTERNAL */
|
|
{ "news", LOG_NEWS },
|
|
{ "security", LOG_AUTH }, /* DEPRECATED */
|
|
{ "syslog", LOG_SYSLOG },
|
|
{ "user", LOG_USER },
|
|
{ "uucp", LOG_UUCP },
|
|
{ "local0", LOG_LOCAL0 },
|
|
{ "local1", LOG_LOCAL1 },
|
|
{ "local2", LOG_LOCAL2 },
|
|
{ "local3", LOG_LOCAL3 },
|
|
{ "local4", LOG_LOCAL4 },
|
|
{ "local5", LOG_LOCAL5 },
|
|
{ "local6", LOG_LOCAL6 },
|
|
{ "local7", LOG_LOCAL7 },
|
|
{ NULL, -1 }
|
|
};
|
|
#endif
|
|
|
|
/*
|
|
* arguments to setlogmask.
|
|
*/
|
|
#define LOG_MASK(pri) (1 << (pri)) /* mask for one priority */
|
|
#define LOG_UPTO(pri) ((1 << ((pri)+1)) - 1) /* all priorities through pri */
|
|
|
|
/*
|
|
* Option flags for openlog.
|
|
*
|
|
* LOG_ODELAY no longer does anything.
|
|
* LOG_NDELAY is the inverse of what it used to be.
|
|
*/
|
|
#define LOG_PID 0x01 /* log the pid with each message */
|
|
#define LOG_CONS 0x02 /* log on the console if errors in sending */
|
|
#define LOG_ODELAY 0x04 /* delay open until first syslog() (default) */
|
|
#define LOG_NDELAY 0x08 /* don't delay open */
|
|
#define LOG_NOWAIT 0x10 /* don't wait for console forks: DEPRECATED */
|
|
#define LOG_PERROR 0x20 /* log to stderr as well */
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* Close descriptor used to write to system logger.
|
|
|
|
This function is a possible cancellation point and therefore not
|
|
marked with __THROW. */
|
|
extern void closelog (void);
|
|
|
|
/* Open connection to system logger.
|
|
|
|
This function is a possible cancellation point and therefore not
|
|
marked with __THROW. */
|
|
extern void openlog (__const char *__ident, int __option, int __facility);
|
|
|
|
/* Set the log mask level. */
|
|
extern int setlogmask (int __mask) __THROW;
|
|
|
|
/* Generate a log message using FMT string and option arguments.
|
|
|
|
This function is a possible cancellation point and therefore not
|
|
marked with __THROW. */
|
|
extern void syslog (int __pri, __const char *__fmt, ...)
|
|
__attribute__ ((__format__ (__printf__, 2, 3)));
|
|
|
|
#ifdef __USE_BSD
|
|
/* Generate a log message using FMT and using arguments pointed to by AP.
|
|
|
|
This function is not part of POSIX and therefore no official
|
|
cancellation point. But due to similarity with an POSIX interface
|
|
or due to the implementation it is a cancellation point and
|
|
therefore not marked with __THROW. */
|
|
extern void vsyslog (int __pri, __const char *__fmt, __gnuc_va_list __ap)
|
|
__attribute__ ((__format__ (__printf__, 2, 0)));
|
|
#endif
|
|
|
|
|
|
/* Define some macros helping to catch buffer overflows. */
|
|
#if __USE_FORTIFY_LEVEL > 0 && defined __extern_always_inline
|
|
# include <bits/syslog.h>
|
|
#endif
|
|
#ifdef __LDBL_COMPAT
|
|
# include <bits/syslog-ldbl.h>
|
|
#endif
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* sys/syslog.h */
|