Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/runit/svlogd.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/runit/svlogd.c (modified) (7 diffs)

branches/3.3/mindi-busybox/runit/svlogd.c

@@ -27 +27 @@
 
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
-/* TODO: depends on runit_lib.c - review and reduce/eliminate */
 
 /*
@@ -126 +125 @@
 */
 
+//config:config SVLOGD
+//config:   bool "svlogd"
+//config:   default y
+//config:   help
+//config:     svlogd continuously reads log data from its standard input, optionally
+//config:     filters log messages, and writes the data to one or more automatically
+//config:     rotated logs.
+
+//applet:IF_SVLOGD(APPLET(svlogd, BB_DIR_USR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_SVLOGD) += svlogd.o
+
 //usage:#define svlogd_trivial_usage
 //usage:       "[-ttv] [-r C] [-R CHARS] [-l MATCHLEN] [-b BUFLEN] DIR..."
@@ -143 +154 @@
 //usage:   "\n""E,ePATTERN - (de)select line for stderr"
 
-#include <sys/poll.h>
 #include <sys/file.h>
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "runit_lib.h"
 
@@ -224 +235 @@
 #define fl_flag_0      (G.fl_flag_0     )
 #define dirn           (G.dirn          )
+#define line bb_common_bufsiz1
 #define INIT_G() do { \
+    setup_common_bufsiz(); \
     SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
     linemax = 1000; \
@@ -231 +244 @@
     replace = ""; \
 } while (0)
-
-#define line bb_common_bufsiz1
 
 
@@ -746 +757 @@
                 break;
             case 's': {
-                static const struct suffix_mult km_suffixes[] = {
-                    { "k", 1024 },
-                    { "m", 1024*1024 },
-                    { "", 0 }
-                };
                 ld->sizemax = xatou_sfx(&s[1], km_suffixes);
                 break;
@@ -1041 +1047 @@
     if (opt & 2) if (!repl) repl = '_'; // -R
     if (opt & 4) { // -l
-        linemax = xatou_range(l, 0, BUFSIZ-26);
+        linemax = xatou_range(l, 0, COMMON_BUFSIZE-26);
         if (linemax == 0)
-            linemax = BUFSIZ-26;
+            linemax = COMMON_BUFSIZE-26;
         if (linemax < 256)
             linemax = 256;