Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/sysklogd/klogd.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/sysklogd/klogd.c (modified) (5 diffs)

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

@@ -17 +17 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+//config:config KLOGD
+//config:   bool "klogd"
+//config:   default y
+//config:   help
+//config:     klogd is a utility which intercepts and logs all
+//config:     messages from the Linux kernel and sends the messages
+//config:     out to the 'syslogd' utility so they can be logged. If
+//config:     you wish to record the messages produced by the kernel,
+//config:     you should enable this option.
+//config:
+//config:comment "klogd should not be used together with syslog to kernel printk buffer"
+//config:   depends on KLOGD && FEATURE_KMSG_SYSLOG
+//config:
+//config:config FEATURE_KLOGD_KLOGCTL
+//config:   bool "Use the klogctl() interface"
+//config:   default y
+//config:   depends on KLOGD
+//config:   select PLATFORM_LINUX
+//config:   help
+//config:     The klogd applet supports two interfaces for reading
+//config:     kernel messages. Linux provides the klogctl() interface
+//config:     which allows reading messages from the kernel ring buffer
+//config:     independently from the file system.
+//config:
+//config:     If you answer 'N' here, klogd will use the more portable
+//config:     approach of reading them from /proc or a device node.
+//config:     However, this method requires the file to be available.
+//config:
+//config:     If in doubt, say 'Y'.
+
+//applet:IF_KLOGD(APPLET(klogd, BB_DIR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_KLOGD) += klogd.o
 
 //usage:#define klogd_trivial_usage
@@ -26 +59 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <syslog.h>
 
@@ -66 +100 @@
 #else
 
-# include <paths.h>
 # ifndef _PATH_KLOG
 #  ifdef __GNU__
@@ -116 +149 @@
 #define log_buffer bb_common_bufsiz1
 enum {
-    KLOGD_LOGBUF_SIZE = sizeof(log_buffer),
+    KLOGD_LOGBUF_SIZE = COMMON_BUFSIZE,
     OPT_LEVEL      = (1 << 0),
     OPT_FOREGROUND = (1 << 1),
@@ -141 +174 @@
     int opt;
     int used;
+
+    setup_common_bufsiz();
 
     opt = getopt32(argv, "c:n", &opt_c);