Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/sysklogd/klogd.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/sysklogd/klogd.c (modified) (4 diffs)

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

@@ -17 +17 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//usage:#define klogd_trivial_usage
+//usage:       "[-c N] [-n]"
+//usage:#define klogd_full_usage "\n\n"
+//usage:       "Kernel logger\n"
+//usage:     "\n    -c N    Print to console messages more urgent than prio N (1-8)"
+//usage:     "\n    -n  Run in foreground"
 
 #include "libbb.h"
@@ -189 +196 @@
     syslog(LOG_NOTICE, "klogd started: %s", bb_banner);
 
+    write_pidfile(CONFIG_PID_FILE_PATH "/klogd.pid");
+
     used = 0;
     while (!bb_got_signal) {
@@ -232 +241 @@
             if (*start == '<') {
                 start++;
-                if (*start) {
-                    /* kernel never generates multi-digit prios */
-                    priority = (*start - '0');
-                    start++;
-                }
+                if (*start)
+                    priority = strtoul(start, &start, 10);
                 if (*start == '>')
                     start++;
@@ -252 +258 @@
     klogd_close();
     syslog(LOG_NOTICE, "klogd: exiting");
+    remove_pidfile(CONFIG_PID_FILE_PATH "/klogd.pid");
     if (bb_got_signal)
         kill_myself_with_sig(bb_got_signal);