made note of my recent changes

[oweals/busybox.git] / syslogd.c

diff --git a/syslogd.c b/syslogd.c
index 3c7b0170d488f35167055fe85f3346381106f6c4..24c721f8eb4c9915a8f41025184622ecb70396c7 100644 (file)
--- a/syslogd.c
+++ b/syslogd.c
@@ -22,6 +22,7 @@
 
 #include "internal.h"
 #include <stdio.h>
+#include <stdarg.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
@@ -56,13 +57,16 @@ static char LocalHostName[32];
 
 static const char syslogd_usage[] =
     "syslogd [OPTION]...\n\n"
-    "Linux system logging utility.\n\n"
+    "Linux 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"
+#endif
     "\t-O\tSpecify an alternate log file.  default=/var/log/messages\n";
 
-static int kmsg;
 
 /* try to open up the specified device */
 static int device_open(char *device, int mode)
@@ -145,7 +149,8 @@ static void logMessage( int pri, char* msg)
 
 static void quit_signal(int sig)
 {
-    logMessage(LOG_SYSLOG|LOG_INFO, "syslogd exiting");
+    logMessage(LOG_SYSLOG|LOG_INFO, "System log daemon exiting.");
+    unlink( _PATH_LOG);
     exit( TRUE);
 }
 
@@ -184,32 +189,27 @@ static void doSyslogd(void)
     signal(SIGALRM, domark);
     alarm(MarkInterval);
 
+
+    unlink( _PATH_LOG);
     memset(&sunx, 0, sizeof(sunx));
     sunx.sun_family = AF_UNIX; /* Unix domain socket */
     strncpy(sunx.sun_path, _PATH_LOG, sizeof(sunx.sun_path));
-    if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0 ) {
+    if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0 ) {
         perror("Couldn't obtain descriptor for socket " _PATH_LOG);
        exit( FALSE);
     }
 
     addrLength = sizeof(sunx.sun_family) + strlen(sunx.sun_path);
     if ( (bind(fd, (struct sockaddr *) &sunx, addrLength)) ||
-           (chmod(_PATH_LOG, 0666) < 0) ||
-           (listen(fd, 5)) ) 
+           (fchmod(fd, 0666) < 0) || (listen(fd, 5)) ) 
     {
        perror("Could not connect to socket " _PATH_LOG);
        exit( FALSE);
     }
     
     
-    /* Get localhost's name */
-    gethostname(LocalHostName, sizeof(LocalHostName));
-    if ( (p = strchr(LocalHostName, '.')) ) {
-       *p++ = '\0';
-    }
-    
     logMessage(LOG_SYSLOG|LOG_INFO, "syslogd started: "
-           "BusyBox v" BB_VER " (" BB_BT ") multi-call binary");
+           "BusyBox v" BB_VER " (" BB_BT ")");
 
 
     while ((conn = accept(fd, (struct sockaddr *) &sunx, 
@@ -254,20 +254,21 @@ static void doSyslogd(void)
     close(fd);
 }
 
+#ifdef BB_KLOGD
+
 static void klogd_signal(int sig)
 {
-    //ksyslog(7, NULL, 0);
-    //ksyslog(0, 0, 0);
-    logMessage(LOG_SYSLOG|LOG_INFO, "Kernel log daemon terminating.");
+    ksyslog(7, NULL, 0);
+    ksyslog(0, 0, 0);
+    logMessage(LOG_SYSLOG|LOG_INFO, "Kernel log daemon exiting.");
     exit( TRUE);
 }
 
-
 static void doKlogd(void)
 {
     int priority=LOG_INFO;
-    struct stat sb;
     char log_buffer[4096];
+    char *logp;
 
     /* Set up sig handlers */
     signal(SIGINT,  klogd_signal);
@@ -275,29 +276,13 @@ static void doKlogd(void)
     signal(SIGTERM, klogd_signal);
     signal(SIGHUP,  klogd_signal);
     logMessage(LOG_SYSLOG|LOG_INFO, "klogd started: "
-           "BusyBox v" BB_VER " (" BB_BT ") multi-call binary");
-
-    //ksyslog(1, NULL, 0);
-    if ( ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT)) ||
-           ( (kmsg = open(_PATH_KLOG, O_RDONLY)) < 0 ) ) {
-       char message[80];
-       snprintf(message, 79, "klogd: Cannot open %s, " \
-               "%d - %s.\n", _PATH_KLOG, errno, strerror(errno));
-       logMessage(LOG_SYSLOG|LOG_ERR, message);
-       klogd_signal(0);
-    }
+           "BusyBox v" BB_VER " (" BB_BT ")");
+
+    ksyslog(1, NULL, 0);
+
     while (1) {
+       /* Use kernel syscalls */
        memset(log_buffer, '\0', sizeof(log_buffer));
-       if ( read(kmsg, log_buffer, sizeof(log_buffer)-1) < 0 ) {
-           char message[80];
-           if ( errno == EINTR )
-               continue;
-           snprintf(message, 79, "klogd: Cannot read proc file system: %d - %s.\n", 
-                   errno, strerror(errno));
-           logMessage(LOG_SYSLOG|LOG_ERR, message);
-           klogd_signal(0);
-       }
-#if 0
        if ( ksyslog(2, log_buffer, sizeof(log_buffer)) < 0 ) {
            char message[80];
            if ( errno == EINTR )
@@ -307,8 +292,7 @@ static void doKlogd(void)
            logMessage(LOG_SYSLOG|LOG_ERR, message);
            exit(1);
        }
-#endif
-       fprintf(stderr, "the kernel says '%s'\n", log_buffer);
+       logp=log_buffer;
         if ( *log_buffer == '<' )
         {
            switch ( *(log_buffer+1) )
@@ -338,20 +322,25 @@ static void doKlogd(void)
                default:
                    priority = LOG_DEBUG;
            }
-           *log_buffer += 3;
+           logp+=3;
         }
-       logMessage(LOG_KERN|priority, log_buffer);
+       logMessage(LOG_KERN|priority, logp);
     }
 
 }
 
+#endif
 
 extern int syslogd_main(int argc, char **argv)
 {
     int        pid, klogd_pid;
     int doFork = TRUE;
+#ifdef BB_KLOGD
+    int startKlogd = TRUE;
+#endif
+    char *p;
     char **argv1=argv;
-
+    
     while (--argc > 0 && **(++argv1) == '-') {
        while (*(++(*argv1))) {
            switch (**argv1) {
@@ -364,6 +353,11 @@ extern int syslogd_main(int argc, char **argv)
            case 'n':
                doFork = FALSE;
                break;
+#ifdef BB_KLOGD
+           case 'K':
+               startKlogd = FALSE;
+               break;
+#endif
            case 'O':
                if (--argc == 0) {
                    usage(syslogd_usage);
@@ -375,6 +369,12 @@ extern int syslogd_main(int argc, char **argv)
            }
        }
     }
+    
+    /* Store away localhost's name before the fork */
+    gethostname(LocalHostName, sizeof(LocalHostName));
+    if ( (p = strchr(LocalHostName, '.')) ) {
+       *p++ = '\0';
+    }
 
     if (doFork == TRUE) {
        pid = fork();
@@ -388,12 +388,16 @@ extern int syslogd_main(int argc, char **argv)
        doSyslogd();
     }
 
-    /* Start klogd process */
-    klogd_pid = fork();
-    if (klogd_pid == 0 ) {
-           strncpy(argv[0], "klogd", strlen(argv[0]));
-           doKlogd();
+#ifdef BB_KLOGD
+    /* Start up the klogd process */
+    if (startKlogd == TRUE) {
+       klogd_pid = fork();
+       if (klogd_pid == 0 ) {
+               strncpy(argv[0], "klogd", strlen(argv[0]));
+               doKlogd();
+       }
     }
+#endif
 
     exit( TRUE);
 }