X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=syslogd.c;h=aa1218f3f18ae288b8645a97da55ebca127b1ed9;hb=34e1941c32cd9366d4ada22c3ab3e42b9c986a2b;hp=004e6ab1d452bc7c3da02a320d17ee9d98c3ddd0;hpb=e3ed156eeb241234f0ad7d12363172e655209654;p=oweals%2Fbusybox.git diff --git a/syslogd.c b/syslogd.c index 004e6ab1d..aa1218f3f 100644 --- a/syslogd.c +++ b/syslogd.c @@ -24,6 +24,8 @@ */ #include "internal.h" +#include +#include #include #include #include @@ -31,17 +33,30 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include -#include +#include +#include + +#if ! defined __GLIBC__ && ! defined __UCLIBC__ + +typedef unsigned int socklen_t; + +#ifndef __alpha__ +# define __NR_klogctl __NR_syslog +static inline _syscall3(int, klogctl, int, type, char *, b, int, len); +#else /* __alpha__ */ +#define klogctl syslog +#endif + +#else +# include +#endif -#define ksyslog klogctl -extern int ksyslog(int type, char *buf, int len); /* SYSLOG_NAMES defined to pull some extra junk from syslog.h */ @@ -52,7 +67,7 @@ extern int ksyslog(int type, char *buf, int len); #define __LOG_FILE "/var/log/messages" /* Path to the unix socket */ -char lfile[PATH_MAX] = ""; +char lfile[BUFSIZ] = ""; static char *logFilePath = __LOG_FILE; @@ -63,16 +78,19 @@ static int MarkInterval = 20 * 60; static char LocalHostName[32]; static const char syslogd_usage[] = - "syslogd [OPTION]...\n\n" - "Linux system and kernel (provides klogd) logging utility.\n" + "syslogd [OPTION]...\n" +#ifndef BB_FEATURE_TRIVIAL_HELP + "\nLinux system and kernel (provides klogd) logging utility.\n" "Note that this version of syslogd/klogd ignores /etc/syslog.conf.\n\n" "Options:\n" - "\t-m\tChange the mark timestamp interval. default=20min. 0=off\n" - "\t-n\tDo not fork into the background (for when run by init)\n" -#ifdef BB_KLOGD - "\t-K\tDo not start up the klogd process (by default syslogd spawns klogd).\n" + "\t-m NUM\t\tInterval between MARK lines (default=20min, 0=off)\n" + "\t-n\t\tRun as a foreground process\n" +#ifdef BB_FEATURE_KLOGD + "\t-K\t\tDo not start up the klogd process\n" #endif - "\t-O\tSpecify an alternate log file. default=/var/log/messages\n"; + "\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n" +#endif + ; /* Note: There is also a function called "message()" in init.c */ /* Print a message to the log file. */ @@ -166,16 +184,59 @@ static void domark(int sig) } } +#define BUFSIZE 1023 +static int serveConnection (int conn) +{ + char buf[ BUFSIZE + 1 ]; + int n_read; + + while ((n_read = read (conn, buf, BUFSIZE )) > 0) { + + int pri = (LOG_USER | LOG_NOTICE); + char line[ BUFSIZE + 1 ]; + unsigned char c; + + char *p = buf, *q = line; + + buf[ n_read - 1 ] = '\0'; + + while (p && (c = *p) && q < &line[ sizeof (line) - 1 ]) { + if (c == '<') { + /* Parse the magic priority number. */ + pri = 0; + while (isdigit (*(++p))) { + pri = 10 * pri + (*p - '0'); + } + if (pri & ~(LOG_FACMASK | LOG_PRIMASK)) + pri = (LOG_USER | LOG_NOTICE); + } else if (c == '\n') { + *q++ = ' '; + } else if (iscntrl (c) && (c < 0177)) { + *q++ = '^'; + *q++ = c ^ 0100; + } else { + *q++ = c; + } + p++; + } + *q = '\0'; + /* Now log it */ + logMessage (pri, line); + } + return (0); +} + static void doSyslogd (void) __attribute__ ((noreturn)); static void doSyslogd (void) { struct sockaddr_un sunx; - size_t addrLength; + socklen_t addrLength; + int sock_fd; fd_set fds; - char lfile[PATH_MAX]; + char lfile[BUFSIZ]; /* Set up signal handlers. */ signal (SIGINT, quit_signal); @@ -189,7 +250,7 @@ static void doSyslogd (void) /* Create the syslog file so realpath() can work. */ close (open (_PATH_LOG, O_RDWR | O_CREAT, 0644)); if (realpath (_PATH_LOG, lfile) == NULL) - fatalError ("Could not resolv path to " _PATH_LOG ": %s", strerror (errno)); + fatalError ("Could not resolv path to " _PATH_LOG ": %s\n", strerror (errno)); unlink (lfile); @@ -197,14 +258,14 @@ static void doSyslogd (void) sunx.sun_family = AF_UNIX; strncpy (sunx.sun_path, lfile, sizeof (sunx.sun_path)); if ((sock_fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) - fatalError ("Couldn't obtain descriptor for socket " _PATH_LOG ": %s", strerror (errno)); + fatalError ("Couldn't obtain descriptor for socket " _PATH_LOG ": %s\n", strerror (errno)); addrLength = sizeof (sunx.sun_family) + strlen (sunx.sun_path); if ((bind (sock_fd, (struct sockaddr *) &sunx, addrLength)) || (listen (sock_fd, 5))) - fatalError ("Could not connect to socket " _PATH_LOG ": %s", strerror (errno)); + fatalError ("Could not connect to socket " _PATH_LOG ": %s\n", strerror (errno)); if (chmod (lfile, 0666) < 0) - fatalError ("Could not set permission on " _PATH_LOG ": %s", strerror (errno)); + fatalError ("Could not set permission on " _PATH_LOG ": %s\n", strerror (errno)); FD_ZERO (&fds); FD_SET (sock_fd, &fds); @@ -246,47 +307,8 @@ static void doSyslogd (void) continue; } - if (pid > 0) { - -# define BUFSIZE 1023 - char buf[ BUFSIZE + 1 ]; - int n_read; - - while ((n_read = read (conn, buf, BUFSIZE )) > 0) { - - int pri = (LOG_USER | LOG_NOTICE); - char line[ BUFSIZE + 1 ]; - unsigned char c; - - char *p = buf, *q = line; - - buf[ n_read - 1 ] = '\0'; - - while (p && (c = *p) && q < &line[ sizeof (line) - 1 ]) { - if (c == '<') { - /* Parse the magic priority number. */ - pri = 0; - while (isdigit (*(++p))) { - pri = 10 * pri + (*p - '0'); - } - if (pri & ~(LOG_FACMASK | LOG_PRIMASK)) - pri = (LOG_USER | LOG_NOTICE); - } else if (c == '\n') { - *q++ = ' '; - } else if (iscntrl (c) && (c < 0177)) { - *q++ = '^'; - *q++ = c ^ 0100; - } else { - *q++ = c; - } - p++; - } - *q = '\0'; - /* Now log it */ - logMessage (pri, line); - } - exit (0); - } + if (pid == 0) + serveConnection (conn); close (conn); } } @@ -294,12 +316,12 @@ static void doSyslogd (void) } } -#ifdef BB_KLOGD +#ifdef BB_FEATURE_KLOGD static void klogd_signal(int sig) { - ksyslog(7, NULL, 0); - ksyslog(0, 0, 0); + klogctl(7, NULL, 0); + klogctl(0, 0, 0); logMessage(0, "Kernel log daemon exiting."); exit(TRUE); } @@ -319,12 +341,12 @@ static void doKlogd (void) logMessage(0, "klogd started: " "BusyBox v" BB_VER " (" BB_BT ")"); - ksyslog(1, NULL, 0); + klogctl(1, NULL, 0); while (1) { /* Use kernel syscalls */ memset(log_buffer, '\0', sizeof(log_buffer)); - if (ksyslog(2, log_buffer, sizeof(log_buffer)) < 0) { + if (klogctl(2, log_buffer, sizeof(log_buffer)) < 0) { char message[80]; if (errno == EINTR) @@ -385,7 +407,7 @@ extern int syslogd_main(int argc, char **argv) int pid, klogd_pid; int doFork = TRUE; -#ifdef BB_KLOGD +#ifdef BB_FEATURE_KLOGD int startKlogd = TRUE; #endif int stopDoingThat = FALSE; @@ -405,7 +427,7 @@ extern int syslogd_main(int argc, char **argv) case 'n': doFork = FALSE; break; -#ifdef BB_KLOGD +#ifdef BB_FEATURE_KLOGD case 'K': startKlogd = FALSE; break; @@ -423,6 +445,9 @@ extern int syslogd_main(int argc, char **argv) } } + if (argc > 0) + usage(syslogd_usage); + /* Store away localhost's name before the fork */ gethostname(LocalHostName, sizeof(LocalHostName)); if ((p = strchr(LocalHostName, '.'))) { @@ -431,7 +456,7 @@ extern int syslogd_main(int argc, char **argv) umask(0); -#ifdef BB_KLOGD +#ifdef BB_FEATURE_KLOGD /* Start up the klogd process */ if (startKlogd == TRUE) { klogd_pid = fork(); @@ -452,7 +477,7 @@ extern int syslogd_main(int argc, char **argv) doSyslogd(); } - exit(TRUE); + return(TRUE); } /*