Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/sysklogd/klogd.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/sysklogd/klogd.c (modified) (5 diffs)

branches/2.2.5/mindi-busybox/sysklogd/klogd.c

@@ -18 +18 @@
  */
 
-#include "busybox.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>     /* for our signal() handlers */
-#include <string.h>     /* strncpy() */
-#include <errno.h>      /* errno and friends */
-#include <unistd.h>
-#include <ctype.h>
+#include "libbb.h"
 #include <sys/syslog.h>
 #include <sys/klog.h>
@@ -33 +26 @@
     klogctl(7, NULL, 0);
     klogctl(0, 0, 0);
-    /* logMessage(0, "Kernel log daemon exiting."); */
-    syslog(LOG_NOTICE, "Kernel log daemon exiting.");
+    syslog(LOG_NOTICE, "Kernel log daemon exiting");
     exit(EXIT_SUCCESS);
 }
@@ -41 +33 @@
 #define OPT_FOREGROUND   2
 
-#define KLOGD_LOGBUF_SIZE 4096
+#define KLOGD_LOGBUF_SIZE BUFSIZ
+#define log_buffer bb_common_bufsiz1
 
+int klogd_main(int argc, char **argv);
 int klogd_main(int argc, char **argv)
 {
-    RESERVE_CONFIG_BUFFER(log_buffer, KLOGD_LOGBUF_SIZE);
-    int console_log_level = -1;
-    int priority = LOG_INFO;
-    int i, n, lastc;
+    int i = i; /* silence gcc */
     char *start;
 
+    /* do normal option parsing */
+    getopt32(argv, "c:n", &start);
 
-    {
-        unsigned long opt;
+    if (option_mask32 & OPT_LEVEL) {
+        /* Valid levels are between 1 and 8 */
+        i = xatoul_range(start, 1, 8);
+    }
 
-        /* do normal option parsing */
-        opt = bb_getopt_ulflags(argc, argv, "c:n", &start);
-
-        if (opt & OPT_LEVEL) {
-            /* Valid levels are between 1 and 8 */
-            console_log_level = bb_xgetlarg(start, 10, 1, 8);
-        }
-
-        if (!(opt & OPT_FOREGROUND)) {
-#ifdef BB_NOMMU
-            vfork_daemon_rexec(0, 1, argc, argv, "-n");
-#else
-            bb_xdaemon(0, 1);
-#endif
-        }
+    if (!(option_mask32 & OPT_FOREGROUND)) {
+        bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
     }
 
@@ -83 +65 @@
     klogctl(1, NULL, 0);
 
-    /* Set level of kernel console messaging.. */
-    if (console_log_level != -1)
-        klogctl(8, NULL, console_log_level);
+    /* Set level of kernel console messaging. */
+    if (option_mask32 & OPT_LEVEL)
+        klogctl(8, NULL, i);
 
-    syslog(LOG_NOTICE, "klogd started: %s", BB_BANNER);
+    syslog(LOG_NOTICE, "klogd started: %s", bb_banner);
 
+    /* Note: this code does not detect incomplete messages
+     * (messages not ending with '\n' or just when kernel
+     * generates too many messages for us to keep up)
+     * and will split them in two separate lines */
     while (1) {
-        /* Use kernel syscalls */
-        memset(log_buffer, '\0', KLOGD_LOGBUF_SIZE);
-        n = klogctl(2, log_buffer, KLOGD_LOGBUF_SIZE);
+        int n;
+        int priority;
+
+        n = klogctl(2, log_buffer, KLOGD_LOGBUF_SIZE - 1);
         if (n < 0) {
             if (errno == EINTR)
                 continue;
-            syslog(LOG_ERR, "klogd: Error from sys_sycall: %d - %m.\n",
-                   errno);
-            exit(EXIT_FAILURE);
+            syslog(LOG_ERR, "klogd: error from klogctl(2): %d - %m",
+                    errno);
+            break;
         }
-
-        /* klogctl buffer parsing modelled after code in dmesg.c */
-        start = &log_buffer[0];
-        lastc = '\0';
-        for (i = 0; i < n; i++) {
-            if (lastc == '\0' && log_buffer[i] == '<') {
-                priority = 0;
+        log_buffer[n] = '\n';
+        i = 0;
+        while (i < n) {
+            priority = LOG_INFO;
+            start = &log_buffer[i];
+            if (log_buffer[i] == '<') {
                 i++;
-                while (log_buffer[i] >= '0' && log_buffer[i] <= '9') {
-                    priority = priority * 10 + (log_buffer[i] - '0');
+                // kernel never ganerates multi-digit prios
+                //priority = 0;
+                //while (log_buffer[i] >= '0' && log_buffer[i] <= '9') {
+                //  priority = priority * 10 + (log_buffer[i] - '0');
+                //  i++;
+                //}
+                if (isdigit(log_buffer[i])) {
+                    priority = (log_buffer[i] - '0');
                     i++;
                 }
@@ -116 +108 @@
                 start = &log_buffer[i];
             }
-            if (log_buffer[i] == '\n') {
-                log_buffer[i] = '\0';   /* zero terminate this message */
-                syslog(priority, "%s", start);
-                start = &log_buffer[i + 1];
-                priority = LOG_INFO;
-            }
-            lastc = log_buffer[i];
+            while (log_buffer[i] != '\n')
+                i++;
+            log_buffer[i] = '\0';
+            syslog(priority, "%s", start);
+            i++;
         }
     }
-    if (ENABLE_FEATURE_CLEAN_UP)
-        RELEASE_CONFIG_BUFFER(log_buffer);
 
-    return EXIT_SUCCESS;
+    return EXIT_FAILURE;
 }