f470196a4
Bernhard Reutner-Fischer
2008-01-27
Subject
- fix conflicting decls of syslog related facilitynames and prioritynames tables
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
init/init.c +1 -1libbb/info_msg.c +1 -1libbb/verror_msg.c +1 -1loginutils/login.c +1 -1loginutils/passwd.c +0 -1loginutils/sulogin.c +1 -2miscutils/crond.c +1 -1miscutils/devfsd.c +3 -8networking/dnsd.c +1 -1networking/isrv_identd.c +1 -1networking/libiproute/iprule.c +0 -1networking/telnetd.c +1 -2networking/zcip.c +1 -3sysklogd/klogd.c +1 -1sysklogd/logger.c +23 -19sysklogd/syslogd.c +4 -6util-linux/mount.c +1 -1
init/init.c+1 -1
| @@ -10,9 +10,9 @@ | |
| */ | |
| #include "libbb.h" | |
| + | #include <syslog.h> |
| #include <paths.h> | |
| #include <sys/reboot.h> | |
| - | #include <sys/syslog.h> |
| #define INIT_BUFFS_SIZE 256 | |
| #define CONSOLE_NAME_SIZE 32 | |
libbb/info_msg.c+1 -1
| @@ -7,8 +7,8 @@ | |
| * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | |
| */ | |
| - | #include <syslog.h> |
| #include "libbb.h" | |
| + | #include <syslog.h> |
| void bb_info_msg(const char *s, ...) | |
| { | |
libbb/verror_msg.c+1 -1
| @@ -7,8 +7,8 @@ | |
| * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | |
| */ | |
| - | #include <syslog.h> |
| #include "libbb.h" | |
| + | #include <syslog.h> |
| smallint logmode = LOGMODE_STDIO; | |
| const char *msg_eol = "\n"; | |
loginutils/login.c+1 -1
| @@ -4,9 +4,9 @@ | |
| */ | |
| #include "libbb.h" | |
| + | #include <syslog.h> |
| #include <utmp.h> | |
| #include <sys/resource.h> | |
| - | #include <syslog.h> |
| #if ENABLE_SELINUX | |
| #include <selinux/selinux.h> /* for is_selinux_enabled() */ | |
loginutils/passwd.c+0 -1
| @@ -6,7 +6,6 @@ | |
| #include "libbb.h" | |
| #include <syslog.h> | |
| - | |
| static void nuke_str(char *str) | |
| { | |
| if (str) memset(str, 0, strlen(str)); | |
loginutils/sulogin.c+1 -2
| @@ -5,9 +5,8 @@ | |
| * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | |
| */ | |
| - | #include <syslog.h> |
| - | |
| #include "libbb.h" | |
| + | #include <syslog.h> |
| //static void catchalarm(int ATTRIBUTE_UNUSED junk) | |
| //{ | |
miscutils/crond.c+1 -1
| @@ -11,8 +11,8 @@ | |
| * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | |
| */ | |
| - | #include <sys/syslog.h> |
| #include "libbb.h" | |
| + | #include <syslog.h> |
| #ifndef CRONTABS | |
| #define CRONTABS "/var/spool/cron/crontabs" | |
miscutils/devfsd.c+3 -8
| @@ -53,17 +53,12 @@ | |
| The postal address is: | |
| Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia. | |
| */ | |
| - | |
| - | //#include <sys/wait.h> |
| - | //#include <sys/ioctl.h> |
| - | //#include <sys/socket.h> |
| - | #include <sys/un.h> |
| - | #include <dirent.h> |
| - | #include <syslog.h> |
| - | #include <sys/sysmacros.h> |
| #include "libbb.h" | |
| #include "xregex.h" | |
| + | #include <syslog.h> |
| + | #include <sys/un.h> |
| + | #include <sys/sysmacros.h> |
| /* Various defines taken from linux/major.h */ | |
| #define IDE0_MAJOR 3 | |
networking/dnsd.c+1 -1
| @@ -17,8 +17,8 @@ | |
| * the first porting of oao' scdns to busybox also. | |
| */ | |
| - | #include <syslog.h> |
| #include "libbb.h" | |
| + | #include <syslog.h> |
| //#define DEBUG 1 | |
| #define DEBUG 0 | |
networking/isrv_identd.c+1 -1
| @@ -7,8 +7,8 @@ | |
| * Licensed under GPL version 2, see file LICENSE in this tarball for details. | |
| */ | |
| - | #include <syslog.h> |
| #include "libbb.h" | |
| + | #include <syslog.h> |
| #include "isrv.h" | |
| enum { TIMEOUT = 20 }; | |
networking/libiproute/iprule.c+0 -1
| @@ -16,7 +16,6 @@ | |
| * initially integrated into busybox by Bernhard Fischer | |
| */ | |
| - | #include <syslog.h> |
| #include <netinet/in.h> | |
| #include <netinet/ip.h> | |
| #include <arpa/inet.h> | |
networking/telnetd.c+1 -2
| @@ -24,14 +24,13 @@ | |
| #define DEBUG 0 | |
| #include "libbb.h" | |
| + | #include <syslog.h> |
| #if DEBUG | |
| #define TELCMDS | |
| #define TELOPTS | |
| #endif | |
| #include <arpa/telnet.h> | |
| - | #include <sys/syslog.h> |
| - | |
| /* Structure that describes a session */ | |
| struct tsession { | |
networking/zcip.c+1 -3
| @@ -23,9 +23,6 @@ | |
| // - avoid silent script failures, especially under load... | |
| // - link status monitoring (restart on link-up; stop on link-down) | |
| - | #include <syslog.h> |
| - | #include <poll.h> |
| - | #include <sys/wait.h> |
| #include <netinet/ether.h> | |
| #include <net/ethernet.h> | |
| #include <net/if.h> | |
| @@ -34,6 +31,7 @@ | |
| #include <linux/sockios.h> | |
| #include "libbb.h" | |
| + | #include <syslog.h> |
| /* We don't need more than 32 bits of the counter */ | |
| #define MONOTONIC_US() ((unsigned)monotonic_us()) | |
sysklogd/klogd.c+1 -1
| @@ -18,7 +18,7 @@ | |
| */ | |
| #include "libbb.h" | |
| - | #include <sys/syslog.h> |
| + | #include <syslog.h> |
| #include <sys/klog.h> | |
| static void klogd_signal(int sig ATTRIBUTE_UNUSED) | |
sysklogd/logger.c+23 -19
| @@ -8,28 +8,32 @@ | |
| */ | |
| #include "libbb.h" | |
| - | |
| - | #if !defined CONFIG_SYSLOGD |
| - | |
| - | /* SYSLOG_NAMES defined to pull prioritynames[] and facilitynames[] |
| - | * from syslog.h. Grrrr - glibc puts those in _rwdata_! :( */ |
| + | #ifndef CONFIG_SYSLOGD |
| #define SYSLOG_NAMES | |
| - | #define SYSLOG_NAMES_CONST /* uclibc is saner :) */ |
| - | #include <sys/syslog.h> |
| - | |
| + | #define SYSLOG_NAMES_CONST |
| + | #include <syslog.h> |
| #else | |
| - | #include <sys/syslog.h> |
| - | # ifndef __dietlibc__ |
| - | /* We have to do this since the header file defines static |
| - | * structures. Argh.... bad libc, bad, bad... |
| - | */ |
| - | typedef struct _code { |
| - | char *c_name; |
| - | int c_val; |
| - | } CODE; |
| - | extern CODE prioritynames[]; |
| - | extern CODE facilitynames[]; |
| + | /* brokenness alert. Everybody except dietlibc get's this wrong by neither |
| + | * providing a typedef nor an extern for facilitynames and prioritynames |
| + | * in syslog.h. |
| + | */ |
| + | # include <syslog.h> |
| + | # ifndef __dietlibc__ |
| + | /* We have to do this since the header file does neither provide a sane type |
| + | * for this structure nor extern definitions. Argh.... bad libc, bad, bad... |
| + | */ |
| + | typedef struct _code { |
| + | char *c_name; /* FIXME: this should be const char *const c_name ! */ |
| + | int c_val; |
| + | } CODE; |
| + | # ifdef __UCLIBC__ |
| + | extern const CODE prioritynames[]; |
| + | extern const CODE facilitynames[]; |
| + | # else |
| + | extern CODE prioritynames[]; |
| + | extern CODE facilitynames[]; |
| # endif | |
| + | # endif |
| #endif | |
| /* Decode a symbolic name to a numeric value | |
sysklogd/syslogd.c+4 -6
| @@ -14,14 +14,12 @@ | |
| */ | |
| #include "libbb.h" | |
| + | #define SYSLOG_NAMES |
| + | #define SYSLOG_NAMES_CONST |
| + | #include <syslog.h> |
| + | |
| #include <paths.h> | |
| #include <sys/un.h> | |
| - | |
| - | /* SYSLOG_NAMES defined to pull prioritynames[] and facilitynames[] |
| - | * from syslog.h. Grrrr - glibc puts those in _rwdata_! :( */ |
| - | #define SYSLOG_NAMES |
| - | #define SYSLOG_NAMES_CONST /* uclibc is saner :) */ |
| - | #include <sys/syslog.h> |
| #include <sys/uio.h> | |
| #if ENABLE_FEATURE_REMOTE_LOG | |
util-linux/mount.c+1 -1
| @@ -20,9 +20,9 @@ | |
| #include <mntent.h> | |
| #include "libbb.h" | |
| + | #include <syslog.h> |
| /* Needed for nfs support only... */ | |
| - | #include <syslog.h> |
| #include <sys/utsname.h> | |
| #undef TRUE | |
| #undef FALSE | |