Fix from Paul Fox to make compressed help text notice config changes.

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

diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index 94376fe52f9cb1f3a9af1d713569700164a7b584..92590d209810c673a8cc974ca0645a3afcd220e0 100644 (file)
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2001 by Gennady Feldman <gfeldman@gena01.com>.
  * Changes: Made this a standalone busybox module which uses standalone
- *                                     syslog() client interface.
+ *                                     syslog() client interface.
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
@@ -14,22 +14,10 @@
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>            /* for our signal() handlers */
@@ -40,9 +28,7 @@
 #include <sys/syslog.h>
 #include <sys/klog.h>
 
-#include "busybox.h"
-
-static void klogd_signal(int sig)
+static void klogd_signal(int sig ATTRIBUTE_UNUSED)
 {
        klogctl(7, NULL, 0);
        klogctl(0, 0, 0);
@@ -51,14 +37,40 @@ static void klogd_signal(int sig)
        exit(EXIT_SUCCESS);
 }
 
-static void doKlogd(const int console_log_level) __attribute__ ((noreturn));
-static void doKlogd(const int console_log_level)
+#define OPT_LEVEL        1
+#define OPT_FOREGROUND   2
+
+#define KLOGD_LOGBUF_SIZE 4096
+
+int klogd_main(int argc, char **argv)
 {
+       RESERVE_CONFIG_BUFFER(log_buffer, KLOGD_LOGBUF_SIZE);
+       int console_log_level = -1;
        int priority = LOG_INFO;
-       char log_buffer[4096];
        int i, n, lastc;
        char *start;
 
+
+       {
+               unsigned long opt;
+
+               /* 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
+               }
+       }
+
        openlog("kernel", 0, LOG_KERN);
 
        /* Set up sig handlers */
@@ -74,16 +86,17 @@ static void doKlogd(const int console_log_level)
        if (console_log_level != -1)
                klogctl(8, NULL, console_log_level);
 
-       syslog(LOG_NOTICE, "klogd started: " BB_BANNER);
+       syslog(LOG_NOTICE, "klogd started: %s", BB_BANNER);
 
        while (1) {
                /* Use kernel syscalls */
-               memset(log_buffer, '\0', sizeof(log_buffer));
-               n = klogctl(2, log_buffer, sizeof(log_buffer));
+               memset(log_buffer, '\0', KLOGD_LOGBUF_SIZE);
+               n = klogctl(2, log_buffer, KLOGD_LOGBUF_SIZE);
                if (n < 0) {
                        if (errno == EINTR)
                                continue;
-                       syslog(LOG_ERR, "klogd: Error return from sys_sycall: %d - %m.\n", errno);
+                       syslog(LOG_ERR, "klogd: Error from sys_sycall: %d - %m.\n",
+                                  errno);
                        exit(EXIT_FAILURE);
                }
 
@@ -94,7 +107,7 @@ static void doKlogd(const int console_log_level)
                        if (lastc == '\0' && log_buffer[i] == '<') {
                                priority = 0;
                                i++;
-                               while (isdigit(log_buffer[i])) {
+                               while (log_buffer[i] >= '0' && log_buffer[i] <= '9') {
                                        priority = priority * 10 + (log_buffer[i] - '0');
                                        i++;
                                }
@@ -104,62 +117,15 @@ static void doKlogd(const int console_log_level)
                        }
                        if (log_buffer[i] == '\n') {
                                log_buffer[i] = '\0';   /* zero terminate this message */
-                               syslog(priority, start);
+                               syslog(priority, "%s", start);
                                start = &log_buffer[i + 1];
                                priority = LOG_INFO;
                        }
                        lastc = log_buffer[i];
                }
        }
-}
-
-extern int klogd_main(int argc, char **argv)
-{
-       /* no options, no getopt */
-       int opt;
-       int doFork = TRUE;
-       unsigned char console_log_level = -1;
-
-       /* do normal option parsing */
-       while ((opt = getopt(argc, argv, "c:n")) > 0) {
-               switch (opt) {
-               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) {
-#if defined(__uClinux__)
-               vfork_daemon_rexec(0, 1, argc, argv, "-n");
-#else /* __uClinux__ */
-               if (daemon(0, 1) < 0)
-                       bb_perror_msg_and_die("daemon");
-#endif /* __uClinux__ */
-       }
-       doKlogd(console_log_level);
+       if (ENABLE_FEATURE_CLEAN_UP)
+               RELEASE_CONFIG_BUFFER(log_buffer);
 
        return EXIT_SUCCESS;
 }
-
-/*
-Local Variables
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/