svc: remove superfluout INIT_G()

[oweals/busybox.git] / runit / svlogd.c

diff --git a/runit/svlogd.c b/runit/svlogd.c
index 8b8a6d858325cd399c4d1357bcc0917e7492ac20..831873d86fcef75aa4987db07c9889027f41e837 100644 (file)
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
    3. The name of the author may not be used to endorse or promote products
       derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
 EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -26,7 +26,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
-/* TODO: depends on runit_lib.c - review and reduce/eliminate */
 
 /*
 Config files
@@ -125,10 +124,22 @@ log message, you can use a pattern like this instead
 -*: *: pid *
 */
 
+//config:config SVLOGD
+//config:      bool "svlogd (15 kb)"
+//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..."
+//usage:       "[-tttv] [-r C] [-R CHARS] [-l MATCHLEN] [-b BUFLEN] DIR..."
 //usage:#define svlogd_full_usage "\n\n"
-//usage:       "Continuously read log data from stdin and write to rotated log files in DIRs"
+//usage:       "Read log data from stdin and write to rotated log files in DIRs"
 //usage:   "\n"
 //usage:   "\n""DIR/config file modifies behavior:"
 //usage:   "\n""sSIZE - when to rotate logs"
@@ -142,9 +153,9 @@ log message, you can use a pattern like this instead
 //usage:   "\n""+,-PATTERN - (de)select line for logging"
 //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"
 
 #define LESS(a,b) ((int)((unsigned)(b) - (unsigned)(a)) > 0)
@@ -223,7 +234,9 @@ struct globals {
 #define blocked_sigset (G.blocked_sigset)
 #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; \
        /*buflen = 1024;*/ \
@@ -231,8 +244,6 @@ struct globals {
        replace = ""; \
 } while (0)
 
-#define line bb_common_bufsiz1
-
 
 #define FATAL "fatal: "
 #define WARNING "warning: "
@@ -328,17 +339,18 @@ static unsigned pmatch(const char *p, const char *s, unsigned len)
 /*** ex fmt_ptime.[ch] ***/
 
 /* NUL terminated */
-static void fmt_time_human_30nul(char *s)
+static void fmt_time_human_30nul(char *s, char dt_delim)
 {
        struct tm *ptm;
        struct timeval tv;
 
        gettimeofday(&tv, NULL);
        ptm = gmtime(&tv.tv_sec);
-       sprintf(s, "%04u-%02u-%02u_%02u:%02u:%02u.%06u000",
+       sprintf(s, "%04u-%02u-%02u%c%02u:%02u:%02u.%06u000",
                (unsigned)(1900 + ptm->tm_year),
                (unsigned)(ptm->tm_mon + 1),
                (unsigned)(ptm->tm_mday),
+               dt_delim,
                (unsigned)(ptm->tm_hour),
                (unsigned)(ptm->tm_min),
                (unsigned)(ptm->tm_sec),
@@ -773,7 +785,7 @@ static NOINLINE unsigned logdir_open(struct logdir *ld, const char *fn)
                        case '!':
                                if (s[1]) {
                                        free(ld->processor);
-                                       ld->processor = wstrdup(s);
+                                       ld->processor = wstrdup(&s[1]);
                                }
                                break;
                        }
@@ -1035,9 +1047,9 @@ int svlogd_main(int argc, char **argv)
        }
        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;
        }
@@ -1149,8 +1161,8 @@ int svlogd_main(int argc, char **argv)
                if (timestamp) {
                        if (timestamp == 1)
                                fmt_time_bernstein_25(stamp);
-                       else /* 2: */
-                               fmt_time_human_30nul(stamp);
+                       else /* 2+: */
+                               fmt_time_human_30nul(stamp, timestamp == 2 ? '_' : 'T');
                        printlen += 26;
                        printptr -= 26;
                        memcpy(printptr, stamp, 25);