X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=syslogd.c;h=aa1218f3f18ae288b8645a97da55ebca127b1ed9;hb=34e1941c32cd9366d4ada22c3ab3e42b9c986a2b;hp=8827265d51808ef2b718c77e405643526de8cf1b;hpb=95c1c1e05f290ccbcc2ff863a62bcee5d57bf5c8;p=oweals%2Fbusybox.git diff --git a/syslogd.c b/syslogd.c index 8827265d5..aa1218f3f 100644 --- a/syslogd.c +++ b/syslogd.c @@ -5,6 +5,8 @@ * Copyright (C) 1999,2000 by Lineo, inc. * Written by Erik Andersen , * + * Copyright (C) 2000 by Karl M. Hegbloom + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -22,6 +24,8 @@ */ #include "internal.h" +#include +#include #include #include #include @@ -29,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 */ @@ -50,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; @@ -61,52 +78,63 @@ 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 FILE\t\tUse an alternate log file (default=/var/log/messages)\n" #endif - "\t-O\tSpecify an alternate log file. default=/var/log/messages\n"; + ; /* Note: There is also a function called "message()" in init.c */ /* Print a message to the log file. */ -static void message(char *fmt, ...) - __attribute__ ((format (printf, 1, 2))); -static void message(char *fmt, ...) +static void message (char *fmt, ...) __attribute__ ((format (printf, 1, 2))); +static void message (char *fmt, ...) { int fd; + struct flock fl; va_list arguments; - if ( (fd = device_open(logFilePath, - O_WRONLY | O_CREAT | O_NOCTTY | O_APPEND | - O_NONBLOCK)) >= 0) { - va_start(arguments, fmt); - vdprintf(fd, fmt, arguments); - va_end(arguments); - close(fd); + fl.l_whence = SEEK_SET; + fl.l_start = 0; + fl.l_len = 1; + + if ((fd = device_open (logFilePath, + O_WRONLY | O_CREAT | O_NOCTTY | O_APPEND | + O_NONBLOCK)) >= 0) { + fl.l_type = F_WRLCK; + fcntl (fd, F_SETLKW, &fl); + va_start (arguments, fmt); + vdprintf (fd, fmt, arguments); + va_end (arguments); + fl.l_type = F_UNLCK; + fcntl (fd, F_SETLKW, &fl); + close (fd); } else { /* Always send console messages to /dev/console so people will see them. */ - if ( (fd = device_open(_PATH_CONSOLE, - O_WRONLY | O_NOCTTY | O_NONBLOCK)) >= 0) { - va_start(arguments, fmt); - vdprintf(fd, fmt, arguments); - va_end(arguments); - close(fd); + if ((fd = device_open (_PATH_CONSOLE, + O_WRONLY | O_NOCTTY | O_NONBLOCK)) >= 0) { + va_start (arguments, fmt); + vdprintf (fd, fmt, arguments); + va_end (arguments); + close (fd); } else { - fprintf(stderr, "Bummer, can't print: "); - va_start(arguments, fmt); - vfprintf(stderr, fmt, arguments); - fflush(stderr); - va_end(arguments); + fprintf (stderr, "Bummer, can't print: "); + va_start (arguments, fmt); + vfprintf (stderr, fmt, arguments); + fflush (stderr); + va_end (arguments); } } } -static void logMessage(int pri, char *msg) +static void logMessage (int pri, char *msg) { time_t now; char *timestamp; @@ -156,127 +184,144 @@ 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 readfds; - char lfile[PATH_MAX]; + fd_set fds; - /* Set up sig handlers */ + char lfile[BUFSIZ]; + + /* Set up signal handlers. */ signal (SIGINT, quit_signal); signal (SIGTERM, quit_signal); signal (SIGQUIT, quit_signal); signal (SIGHUP, SIG_IGN); + signal (SIGCLD, SIG_IGN); signal (SIGALRM, domark); alarm (MarkInterval); - /* 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); - } + /* 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\n", strerror (errno)); unlink (lfile); - memset (&sunx, 0, sizeof(sunx)); - + memset (&sunx, 0, sizeof (sunx)); 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); - } + 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\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); - } + if ((bind (sock_fd, (struct sockaddr *) &sunx, addrLength)) || (listen (sock_fd, 5))) + 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); - } + if (chmod (lfile, 0666) < 0) + fatalError ("Could not set permission on " _PATH_LOG ": %s\n", strerror (errno)); - FD_ZERO (&readfds); - FD_SET (sock_fd, &readfds); + FD_ZERO (&fds); + FD_SET (sock_fd, &fds); logMessage (0, "syslogd started: BusyBox v" BB_VER " (" BB_BT ")"); for (;;) { - int n_ready; - int fd; + + fd_set readfds; + int n_ready; + int fd; + + memcpy (&readfds, &fds, sizeof (fds)); if ((n_ready = select (FD_SETSIZE, &readfds, NULL, NULL, NULL)) < 0) { if (errno == EINTR) continue; /* alarm may have happened. */ - fatalError( "select error: %s\n", strerror(errno)); + fatalError ("select error: %s\n", strerror (errno)); } - /* Skip stdin, stdout, stderr */ - for (fd = 3; fd < FD_SETSIZE; fd++) { + for (fd = 0; (n_ready > 0) && (fd < FD_SETSIZE); fd++) { if (FD_ISSET (fd, &readfds)) { + + --n_ready; + if (fd == sock_fd) { - int conn; - if ((conn = accept(sock_fd, (struct sockaddr *) &sunx, - &addrLength)) < 0) { - fatalError( "accept error: %s\n", strerror(errno)); + + int conn; + pid_t pid; + + if ((conn = accept (sock_fd, (struct sockaddr *) &sunx, &addrLength)) < 0) { + fatalError ("accept error: %s\n", strerror (errno)); } - FD_SET (conn, &readfds); - } - else { -#define BUFSIZE 1024 + 1 - char buf[BUFSIZE]; - char *q, *p; - int n_read; - char line[BUFSIZE]; - unsigned char c; - - /* Keep reading stuff till there is nothing else to read */ - while( (n_read = read (fd, buf, BUFSIZE)) > 0 && errno != EOF) { - int pri = (LOG_USER | LOG_NOTICE); - - memset (line, 0, sizeof(line)); - p = buf; - q = line; - 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); + + pid = fork(); + + if (pid < 0) { + perror ("syslogd: fork"); + close (conn); + continue; } - close (fd); - FD_CLR (fd, &readfds); + + if (pid == 0) + serveConnection (conn); + close (conn); } } } } } -#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); } @@ -296,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) @@ -348,7 +393,6 @@ static void doKlogd (void) #endif -static void daemon_init (char **argv, char *dz, void fn (void)) __attribute__ ((noreturn)); static void daemon_init (char **argv, char *dz, void fn (void)) { setsid(); @@ -363,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; @@ -383,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; @@ -401,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, '.'))) { @@ -409,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(); @@ -430,13 +477,13 @@ extern int syslogd_main(int argc, char **argv) doSyslogd(); } - exit(TRUE); + return(TRUE); } /* - * Local Variables - * c-file-style: "linux" - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ +Local Variables +c-file-style: "linux" +c-basic-offset: 4 +tab-width: 4 +End: +*/