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

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

@@ -126 +126 @@
 */
 
+//usage:#define svlogd_trivial_usage
+//usage:       "[-ttv] [-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:   "\n"
+//usage:   "\n""DIR/config file modifies behavior:"
+//usage:   "\n""sSIZE - when to rotate logs"
+//usage:   "\n""nNUM - number of files to retain"
+/*usage:   "\n""NNUM - min number files to retain" - confusing */
+/*usage:   "\n""tSEC - rotate file if it get SEC seconds old" - confusing */
+//usage:   "\n""!PROG - process rotated log with PROG"
+/*usage:   "\n""uIPADDR - send log over UDP" - unsupported */
+/*usage:   "\n""UIPADDR - send log over UDP and DONT log" - unsupported */
+/*usage:   "\n""pPFX - prefix each line with PFX" - unsupported */
+//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>
@@ -171 +188 @@
 
     void* (*memRchr)(const void *, int, size_t);
+    char *shell;
 
     smallint exitasap;
@@ -366 +384 @@
     sv_ch = ld->fnsave[26];
 
+    if (!G.shell)
+        G.shell = xstrdup(get_shell_name());
+
     while ((pid = vfork()) == -1)
         pause2cannot("vfork for processor", ld->name);
@@ -400 +421 @@
         xmove_fd(fd, 5);
 
-// getenv("SHELL")?
-        execl(DEFAULT_SHELL, DEFAULT_SHELL_SHORT_NAME, "-c", ld->processor, (char*) NULL);
+        execl(G.shell, G.shell, "-c", ld->processor, (char*) NULL);
         bb_perror_msg_and_die(FATAL"can't %s processor %s", "run", ld->name);
     }
@@ -582 +602 @@
             while (fchdir(ld->fddir) == -1)
                 pause2cannot("change directory, want remove old logfile",
-                             ld->name);
+                            ld->name);
             oldest[0] = 'A';
             oldest[1] = oldest[27] = '\0';
             while (!(d = opendir(".")))
                 pause2cannot("open directory, want remove old logfile",
-                             ld->name);
+                            ld->name);
             errno = 0;
             while ((f = readdir(d)))