Try to make indent formatting less horrible

[oweals/busybox.git] / sysklogd / klogd.c

diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index 241a99175fa8f4e1c4c6f81711e1c3f1207f17f3..c132e065cc4058c23c0924cd9a5afbf7a10e5b55 100644 (file)
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -2,18 +2,17 @@
 /*
  * Mini klogd implementation for busybox
  *
- * Copyright (C) 2001 by Gennady Feldman <gfeldman@cachier.com>.
+ * Copyright (C) 2001 by Gennady Feldman <gfeldman@gena01.com>.
  * Changes: Made this a standalone busybox module which uses standalone
  *                                     syslog() client interface.
  *
- * Copyright (C) 1999,2000,2001 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
  *
  * Copyright (C) 2000 by Karl M. Hegbloom <karlheg@debian.org>
  *
- * "circular buffer" Copyright (C) 2000 by Gennady Feldman <gfeldman@mail.com>
+ * "circular buffer" Copyright (C) 2000 by Gennady Feldman <gfeldman@gena01.com>
  *
- * Maintainer: Gennady Feldman <gena01@cachier.com> as of Mar 12, 2001
+ * Maintainer: Gennady Feldman <gfeldman@gena01.com> as of Mar 12, 2001
  *
  * 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
@@ -33,20 +32,13 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <signal.h> /* for our signal() handlers */
-#include <string.h> /* strncpy() */
-#include <errno.h>  /* errno and friends */
+#include <signal.h>            /* for our signal() handlers */
+#include <string.h>            /* strncpy() */
+#include <errno.h>             /* errno and friends */
 #include <unistd.h>
 #include <ctype.h>
 #include <sys/syslog.h>
-
-#if __GNU_LIBRARY__ < 5
-# ifdef __alpha__
-#   define klogctl syslog
-# endif
-#else
-# include <sys/klog.h>
-#endif
+#include <sys/klog.h>
 
 #include "busybox.h"
 
@@ -54,13 +46,13 @@ static void klogd_signal(int sig)
 {
        klogctl(7, NULL, 0);
        klogctl(0, 0, 0);
-       //logMessage(0, "Kernel log daemon exiting.");
-       syslog_msg(LOG_DAEMON, 0, "Kernel log daemon exiting.");
+       /* logMessage(0, "Kernel log daemon exiting."); */
+       syslog_msg(LOG_SYSLOG, LOG_NOTICE, "Kernel log daemon exiting.");
        exit(TRUE);
 }
 
-static void doKlogd (void) __attribute__ ((noreturn));
-static void doKlogd (void)
+static void doKlogd(const char console_log_level) __attribute__ ((noreturn));
+static void doKlogd(const char console_log_level)
 {
        int priority = LOG_INFO;
        char log_buffer[4096];
@@ -76,7 +68,11 @@ static void doKlogd (void)
        /* "Open the log. Currently a NOP." */
        klogctl(1, NULL, 0);
 
-       syslog_msg(LOG_DAEMON, 0, "klogd started: BusyBox v" BB_VER " (" BB_BT ")");
+       /* Set level of kernel console messaging.. */
+       if (console_log_level)
+               klogctl(8, NULL, console_log_level);
+
+       syslog_msg(LOG_SYSLOG, LOG_NOTICE, "klogd started: " BB_BANNER);
 
        while (1) {
                /* Use kernel syscalls */
@@ -87,30 +83,32 @@ static void doKlogd (void)
 
                        if (errno == EINTR)
                                continue;
-                       snprintf(message, 79, "klogd: Error return from sys_sycall: %d - %s.\n", 
-                                                                                               errno, strerror(errno));
-                       syslog_msg(LOG_DAEMON, LOG_SYSLOG | LOG_ERR, message);
+                       snprintf(message, 79,
+                                        "klogd: Error return from sys_sycall: %d - %s.\n", errno,
+                                        strerror(errno));
+                       syslog_msg(LOG_SYSLOG, LOG_ERR, message);
                        exit(1);
                }
 
                /* klogctl buffer parsing modelled after code in dmesg.c */
-               start=&log_buffer[0];
-               lastc='\0';
-               for (i=0; i<n; i++) {
+               start = &log_buffer[0];
+               lastc = '\0';
+               for (i = 0; i < n; i++) {
                        if (lastc == '\0' && log_buffer[i] == '<') {
                                priority = 0;
                                i++;
                                while (isdigit(log_buffer[i])) {
-                                       priority = priority*10+(log_buffer[i]-'0');
+                                       priority = priority * 10 + (log_buffer[i] - '0');
                                        i++;
                                }
-                               if (log_buffer[i] == '>') i++;
+                               if (log_buffer[i] == '>')
+                                       i++;
                                start = &log_buffer[i];
                        }
                        if (log_buffer[i] == '\n') {
-                               log_buffer[i] = '\0';  /* zero terminate this message */
-                               syslog_msg(LOG_DAEMON, LOG_KERN | priority, start);
-                               start = &log_buffer[i+1];
+                               log_buffer[i] = '\0';   /* zero terminate this message */
+                               syslog_msg(LOG_KERN, priority, start);
+                               start = &log_buffer[i + 1];
                                priority = LOG_INFO;
                        }
                        lastc = log_buffer[i];
@@ -123,24 +121,40 @@ extern int klogd_main(int argc, char **argv)
        /* no options, no getopt */
        int opt;
        int doFork = TRUE;
+       unsigned char console_log_level = 7;
 
        /* do normal option parsing */
-       while ((opt = getopt(argc, argv, "n")) > 0) {
+       while ((opt = getopt(argc, argv, "c:n")) > 0) {
                switch (opt) {
-                       case 'n':
-                               doFork = FALSE;
-                               break;
-                       default:
-                               show_usage();
+               case 'c':
+                       if ((optarg == NULL) || (optarg[1] != '\0')) {
+                               bb_show_usage();
+                       }
+                       /* Valid levels are between 1 and 8 */
+                       console_log_level = *optarg - '1';
+                       if (console_log_level > 7) {
+                               bb_show_usage();
+                       }
+                       console_log_level++;
+                       
+                       break;
+               case 'n':
+                       doFork = FALSE;
+                       break;
+               default:
+                       bb_show_usage();
                }
        }
 
-       if (doFork == TRUE) {
+       if (doFork) {
                if (daemon(0, 1) < 0)
-                       perror_msg_and_die("daemon");
+                       bb_perror_msg_and_die("daemon");
+#if defined(__uClinux__)
+               vfork_daemon_rexec(argc, argv, "-n");
+#endif
        }
-       doKlogd();
-       
+       doKlogd(console_log_level);
+
        return EXIT_SUCCESS;
 }