4 files changed, 171 insertions, 120 deletions

diff --git a/runit/chpst.c b/runit/chpst.c
index 846c846d3..ee3a33153 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -463,6 +463,13 @@ int chpst_main(int argc UNUSED_PARAM, char **argv)
                 xchroot(root);
         }
 
+        /* nice should be done before xsetuid */
+        if (opt & OPT_n) {
+                errno = 0;
+                if (nice(xatoi(nicestr)) == -1)
+                        bb_perror_msg_and_die("nice");
+        }
+
         if (opt & OPT_u) {
                 if (setgroups(1, &ugid.gid) == -1)
                         bb_perror_msg_and_die("setgroups");
@@ -470,12 +477,6 @@ int chpst_main(int argc UNUSED_PARAM, char **argv)
                 xsetuid(ugid.uid);
         }
 
-        if (opt & OPT_n) {
-                errno = 0;
-                if (nice(xatoi(nicestr)) == -1)
-                        bb_perror_msg_and_die("nice");
-        }
-
         if (opt & OPT_0)
                 close(STDIN_FILENO);
         if (opt & OPT_1)
diff --git a/runit/runsv.c b/runit/runsv.c
index e0e31508a..939653d12 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -134,9 +134,13 @@ static void fatal2x_cannot(const char *m1, const char *m2)
         bb_error_msg_and_die("%s: fatal: can't %s%s", dir, m1, m2);
         /* was exiting 111 */
 }
+static void warn2_cannot(const char *m1, const char *m2)
+{
+        bb_perror_msg("%s: warning: can't %s%s", dir, m1, m2);
+}
 static void warn_cannot(const char *m)
 {
-        bb_perror_msg("%s: warning: cannot %s", dir, m);
+        warn2_cannot(m, "");
 }
 
 static void s_child(int sig_no UNUSED_PARAM)
@@ -165,10 +169,25 @@ static void update_status(struct svdir *s)
         ssize_t sz;
         int fd;
         svstatus_t status;
+        const char *fstatus ="log/supervise/status";
+        const char *fstatusnew ="log/supervise/status.new";
+        const char *f_stat ="log/supervise/stat";
+        const char *fstatnew ="log/supervise/stat.new";
+        const char *fpid ="log/supervise/pid";
+        const char *fpidnew ="log/supervise/pid.new";
+
+        if (!s->islog) {
+                fstatus += 4;
+                fstatusnew += 4;
+                f_stat += 4;
+                fstatnew += 4;
+                fpid += 4;
+                fpidnew += 4;
+        }
 
         /* pid */
         if (pidchanged) {
-                fd = open_trunc_or_warn("supervise/pid.new");
+                fd = open_trunc_or_warn(fpidnew);
                 if (fd < 0)
                         return;
                 if (s->pid) {
@@ -177,14 +196,13 @@ static void update_status(struct svdir *s)
                         write(fd, spid, size);
                 }
                 close(fd);
-                if (rename_or_warn("supervise/pid.new",
-                                s->islog ? "log/supervise/pid" : "log/supervise/pid"+4))
+                if (rename_or_warn(fpidnew, fpid))
                         return;
                 pidchanged = 0;
         }
 
         /* stat */
-        fd = open_trunc_or_warn("supervise/stat.new");
+        fd = open_trunc_or_warn(fstatnew);
         if (fd < -1)
                 return;
 
@@ -220,8 +238,7 @@ static void update_status(struct svdir *s)
                 close(fd);
         }
 
-        rename_or_warn("supervise/stat.new",
-                s->islog ? "log/supervise/stat" : "log/supervise/stat"+4);
+        rename_or_warn(fstatnew, f_stat);
 
         /* supervise compatibility */
         memset(&status, 0, sizeof(status));
@@ -237,18 +254,17 @@ static void update_status(struct svdir *s)
         if (s->ctrl & C_TERM)
                 status.got_term = 1;
         status.run_or_finish = s->state;
-        fd = open_trunc_or_warn("supervise/status.new");
+        fd = open_trunc_or_warn(fstatusnew);
         if (fd < 0)
                 return;
         sz = write(fd, &status, sizeof(status));
         close(fd);
         if (sz != sizeof(status)) {
-                warn_cannot("write supervise/status.new");
-                unlink("supervise/status.new");
+                warn2_cannot("write ", fstatusnew);
+                unlink(fstatusnew);
                 return;
         }
-        rename_or_warn("supervise/status.new",
-                s->islog ? "log/supervise/status" : "log/supervise/status"+4);
+        rename_or_warn(fstatusnew, fstatus);
 }
 
 static unsigned custom(struct svdir *s, char c)
@@ -266,26 +282,26 @@ static unsigned custom(struct svdir *s, char c)
                 if (st.st_mode & S_IXUSR) {
                         pid = vfork();
                         if (pid == -1) {
-                                warn_cannot("vfork for control/?");
+                                warn2_cannot("vfork for ", a);
                                 return 0;
                         }
                         if (pid == 0) {
                                 /* child */
                                 if (haslog && dup2(logpipe.wr, 1) == -1)
-                                        warn_cannot("setup stdout for control/?");
+                                        warn2_cannot("setup stdout for ", a);
                                 execl(a, a, (char *) NULL);
-                                fatal_cannot("run control/?");
+                                fatal2_cannot("run ", a);
                         }
                         /* parent */
                         if (safe_waitpid(pid, &w, 0) == -1) {
-                                warn_cannot("wait for child control/?");
+                                warn2_cannot("wait for child ", a);
                                 return 0;
                         }
                         return WEXITSTATUS(w) == 0;
                 }
         } else {
                 if (errno != ENOENT)
-                        warn_cannot("stat control/?");
+                        warn2_cannot("stat ", a);
         }
         return 0;
 }
@@ -387,13 +403,13 @@ static int ctrl(struct svdir *s, char c)
         case 'd': /* down */
                 s->sd_want = W_DOWN;
                 update_status(s);
-                if (s->pid && s->state != S_FINISH)
+                if (s->state == S_RUN)
                         stopservice(s);
                 break;
         case 'u': /* up */
                 s->sd_want = W_UP;
                 update_status(s);
-                if (s->pid == 0)
+                if (s->state == S_DOWN)
                         startservice(s);
                 break;
         case 'x': /* exit */
@@ -403,22 +419,22 @@ static int ctrl(struct svdir *s, char c)
                 update_status(s);
                 /* FALLTHROUGH */
         case 't': /* sig term */
-                if (s->pid && s->state != S_FINISH)
+                if (s->state == S_RUN)
                         stopservice(s);
                 break;
         case 'k': /* sig kill */
-                if (s->pid && !custom(s, c))
+                if ((s->state == S_RUN) && !custom(s, c))
                         kill(s->pid, SIGKILL);
                 s->state = S_DOWN;
                 break;
         case 'p': /* sig pause */
-                if (s->pid && !custom(s, c))
+                if ((s->state == S_RUN) && !custom(s, c))
                         kill(s->pid, SIGSTOP);
                 s->ctrl |= C_PAUSE;
                 update_status(s);
                 break;
         case 'c': /* sig cont */
-                if (s->pid && !custom(s, c))
+                if ((s->state == S_RUN) && !custom(s, c))
                         kill(s->pid, SIGCONT);
                 s->ctrl &= ~C_PAUSE;
                 update_status(s);
@@ -426,7 +442,7 @@ static int ctrl(struct svdir *s, char c)
         case 'o': /* once */
                 s->sd_want = W_DOWN;
                 update_status(s);
-                if (!s->pid)
+                if (s->state == S_DOWN)
                         startservice(s);
                 break;
         case 'a': /* sig alarm */
@@ -450,11 +466,26 @@ static int ctrl(struct svdir *s, char c)
         }
         return 1;
  sendsig:
-        if (s->pid && !custom(s, c))
+        if ((s->state == S_RUN) && !custom(s, c))
                 kill(s->pid, sig);
         return 1;
 }
 
+static void open_control(const char *f, struct svdir *s)
+{
+        struct stat st;
+        mkfifo(f, 0600);
+        if (stat(f, &st) == -1)
+                fatal2_cannot("stat ", f);
+        if (!S_ISFIFO(st.st_mode))
+                bb_error_msg_and_die("%s: fatal: %s exists but is not a fifo", dir, f);
+        s->fdcontrol = xopen(f, O_RDONLY|O_NDELAY);
+        close_on_exec_on(s->fdcontrol);
+        s->fdcontrolwrite = xopen(f, O_WRONLY|O_NDELAY);
+        close_on_exec_on(s->fdcontrolwrite);
+        update_status(s);
+}
+
 int runsv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int runsv_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -554,19 +585,9 @@ int runsv_main(int argc UNUSED_PARAM, char **argv)
                 close_on_exec_on(svd[1].fdlock);
         }
 
-        mkfifo("log/supervise/control"+4, 0600);
-        svd[0].fdcontrol = xopen("log/supervise/control"+4, O_RDONLY|O_NDELAY);
-        close_on_exec_on(svd[0].fdcontrol);
-        svd[0].fdcontrolwrite = xopen("log/supervise/control"+4, O_WRONLY|O_NDELAY);
-        close_on_exec_on(svd[0].fdcontrolwrite);
-        update_status(&svd[0]);
+        open_control("log/supervise/control"+4, &svd[0]);
         if (haslog) {
-                mkfifo("log/supervise/control", 0600);
-                svd[1].fdcontrol = xopen("log/supervise/control", O_RDONLY|O_NDELAY);
-                close_on_exec_on(svd[1].fdcontrol);
-                svd[1].fdcontrolwrite = xopen("log/supervise/control", O_WRONLY|O_NDELAY);
-                close_on_exec_on(svd[1].fdcontrolwrite);
-                update_status(&svd[1]);
+                open_control("log/supervise/control", &svd[1]);
         }
         mkfifo("log/supervise/ok"+4, 0600);
         fd = xopen("log/supervise/ok"+4, O_RDONLY|O_NDELAY);
diff --git a/runit/sv.c b/runit/sv.c
index 9e2132259..faa31d4fa 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -25,7 +25,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-/* Taken from http://smarden.sunsite.dk/runit/sv.8.html:
+/* Taken from http://smarden.org/runit/sv.8.html:
 
 sv - control and manage services monitored by runsv
 
@@ -36,17 +36,13 @@ The sv program reports the current status and controls the state of services
 monitored by the runsv(8) supervisor.
 
 services consists of one or more arguments, each argument naming a directory
-service used by runsv(8). If service doesn't start with a dot or slash,
-it is searched in the default services directory /var/service/, otherwise
-relative to the current directory.
+service used by runsv(8). If service doesn't start with a dot or slash and
+doesn't end with a slash, it is searched in the default services directory
+/var/service/, otherwise relative to the current directory.
 
 command is one of up, down, status, once, pause, cont, hup, alarm, interrupt,
-1, 2, term, kill, or exit, or start, stop, restart, shutdown, force-stop,
-force-reload, force-restart, force-shutdown.
-
-The sv program can be sym-linked to /etc/init.d/ to provide an LSB init
-script interface. The service to be controlled then is specified by the
-base name of the "init script".
+1, 2, term, kill, or exit, or start, stop, reload, restart, shutdown,
+force-stop, force-reload, force-restart, force-shutdown, try-restart.
 
 status
     Report the current status of the service, and the appendant log service
@@ -66,9 +62,9 @@ exit
     If the service is running, send it the TERM signal, and the CONT signal.
     Do not restart the service. If the service is down, and no log service
     exists, runsv(8) exits. If the service is down and a log service exists,
-    send the TERM signal to the log service. If the log service is down,
-    runsv(8) exits. This command is ignored if it is given to an appendant
-    log service.
+    runsv(8) closes the standard input of the log service and waits for it to
+    terminate. If the log service is down, runsv(8) exits. This command is
+    ignored if it is given to an appendant log service.
 
 sv actually looks only at the first character of above commands.
 
@@ -85,6 +81,8 @@ start
 stop
     Same as down, but wait up to 7 seconds for the service to become down.
     Then report the status or timeout.
+reload
+    Same as hup, and additionally report the status afterwards.
 restart
     Send the commands term, cont, and up to the service, and wait up to
     7 seconds for the service to restart. Then report the status or timeout.
@@ -112,6 +110,9 @@ force-shutdown
     Same as exit, but wait up to 7 seconds for the runsv(8) process to
     terminate. Then report the status, and on timeout send the service
     the kill command.
+try-restart
+    if the service is running, send it the term and cont commands, and wait up to
+    7 seconds for the service to restart. Then report the status or timeout.
 
 Additional Commands
 
@@ -126,8 +127,8 @@ check
 Options
 
 -v
-    wait up to 7 seconds for the command to take effect.
-    Then report the status or timeout.
+    If the command is up, down, term, once, cont, or exit, then wait up to 7
+    seconds for the command to take effect. Then report the status or timeout.
 -w sec
     Override the default timeout of 7 seconds with sec seconds. Implies -v.
 
@@ -192,6 +193,7 @@ struct globals {
 /* "Bernstein" time format: unix + 0x400000000000000aULL */
         uint64_t tstart, tnow;
         svstatus_t svstatus;
+        unsigned islog;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define acts         (G.acts        )
@@ -200,6 +202,7 @@ struct globals {
 #define tstart       (G.tstart      )
 #define tnow         (G.tnow        )
 #define svstatus     (G.svstatus    )
+#define islog        (G.islog       )
 #define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 
@@ -215,7 +218,7 @@ static void fatal_cannot(const char *m1)
 
 static void out(const char *p, const char *m1)
 {
-        printf("%s%s: %s", p, *service, m1);
+        printf("%s%s%s: %s", p, *service, islog ? "/log" : "", m1);
         if (errno) {
                 printf(": %s", strerror(errno));
         }
@@ -300,15 +303,14 @@ static unsigned svstatus_print(const char *m)
         }
         pid = SWAP_LE32(svstatus.pid_le32);
         timestamp = SWAP_BE64(svstatus.time_be64);
-        if (pid) {
-                switch (svstatus.run_or_finish) {
+        switch (svstatus.run_or_finish) {
+                case 0: printf("down: "); break;
                 case 1: printf("run: "); break;
                 case 2: printf("finish: "); break;
-                }
-                printf("%s: (pid %d) ", m, pid);
-        } else {
-                printf("down: %s: ", m);
         }
+        printf("%s: ", m);
+        if (svstatus.run_or_finish)
+                printf("(pid %d) ", pid);
         diff = tnow - timestamp;
         printf("%us", (diff < 0 ? 0 : diff));
         if (pid) {
@@ -331,16 +333,21 @@ static int status(const char *unused UNUSED_PARAM)
                 return 0;
 
         r = svstatus_print(*service);
+        islog = 1;
         if (chdir("log") == -1) {
                 if (errno != ENOENT) {
-                        printf("; log: "WARN"can't change to log service directory: %s",
-                                        strerror(errno));
-                }
-        } else if (svstatus_get()) {
+                        printf("; ");
+                        warn("can't change directory");
+                } else
+                        bb_putchar('\n');
+        } else {
                 printf("; ");
-                svstatus_print("log");
+                if (svstatus_get()) {
+                        r = svstatus_print("log");
+                        bb_putchar('\n');
+                }
         }
-        bb_putchar('\n'); /* will also flush the output */
+        islog = 0;
         return r;
 }
 
@@ -379,35 +386,53 @@ static int check(const char *a)
         r = svstatus_get();
         if (r == -1)
                 return -1;
-        if (r == 0) {
-                if (*a == 'x')
-                        return 1;
-                return -1;
-        }
-        pid_le32 = svstatus.pid_le32;
-        switch (*a) {
-        case 'x':
-                return 0;
-        case 'u':
-                if (!pid_le32 || svstatus.run_or_finish != 1) return 0;
-                if (!checkscript()) return 0;
-                break;
-        case 'd':
-                if (pid_le32) return 0;
-                break;
-        case 'c':
-                if (pid_le32 && !checkscript()) return 0;
-                break;
-        case 't':
-                if (!pid_le32 && svstatus.want == 'd') break;
-                timestamp = SWAP_BE64(svstatus.time_be64);
-                if ((tstart > timestamp) || !pid_le32 || svstatus.got_term || !checkscript())
-                        return 0;
-                break;
-        case 'o':
-                timestamp = SWAP_BE64(svstatus.time_be64);
-                if ((!pid_le32 && tstart > timestamp) || (pid_le32 && svstatus.want != 'd'))
+        while (*a) {
+                if (r == 0) {
+                        if (*a == 'x')
+                                return 1;
+                        return -1;
+                }
+                pid_le32 = svstatus.pid_le32;
+                switch (*a) {
+                case 'x':
                         return 0;
+                case 'u':
+                        if (!pid_le32 || svstatus.run_or_finish != 1)
+                                return 0;
+                        if (!checkscript())
+                                return 0;
+                        break;
+                case 'd':
+                        if (pid_le32 || svstatus.run_or_finish != 0)
+                                return 0;
+                        break;
+                case 'C':
+                        if (pid_le32 && !checkscript())
+                                return 0;
+                        break;
+                case 't':
+                case 'k':
+                        if (!pid_le32 && svstatus.want == 'd')
+                                break;
+                        timestamp = SWAP_BE64(svstatus.time_be64);
+                        if ((tstart > timestamp) || !pid_le32 || svstatus.got_term || !checkscript())
+                                return 0;
+                        break;
+                case 'o':
+                        timestamp = SWAP_BE64(svstatus.time_be64);
+                        if ((!pid_le32 && tstart > timestamp) || (pid_le32 && svstatus.want != 'd'))
+                                return 0;
+                        break;
+                case 'p':
+                        if (pid_le32 && !svstatus.paused)
+                                return 0;
+                        break;
+                case 'c':
+                        if (pid_le32 && svstatus.paused)
+                                return 0;
+                        break;
+                }
+                ++a;
         }
         printf(OK);
         svstatus_print(*service);
@@ -419,14 +444,10 @@ static int control(const char *a)
 {
         int fd, r, l;
 
-/* Is it an optimization?
-   It causes problems with "sv o SRV; ...; sv d SRV"
-   ('d' is not passed to SRV because its .want == 'd'):
         if (svstatus_get() <= 0)
                 return -1;
-        if (svstatus.want == *a)
+        if (svstatus.want == *a && (*a != 'd' || svstatus.got_term == 1))
                 return 0;
-*/
         fd = open("supervise/control", O_WRONLY|O_NDELAY);
         if (fd == -1) {
                 if (errno != ENODEV)
@@ -516,17 +537,23 @@ static int sv(char **argv)
                 acts = "tc";
                 kll = 1;
                 break;
+        case 't':
+                if (str_equal(action, "try-restart")) {
+                        acts = "tc";
+                        break;
+                }
         case 'c':
                 if (str_equal(action, "check")) {
                         act = NULL;
-                        acts = "c";
+                        acts = "C";
                         break;
                 }
-        case 'u': case 'd': case 'o': case 't': case 'p': case 'h':
+        case 'u': case 'd': case 'o': case 'p': case 'h':
         case 'a': case 'i': case 'k': case 'q': case '1': case '2':
                 action[1] = '\0';
                 acts = action;
-                if (!verbose) cbk = NULL;
+                if (!verbose)
+                        cbk = NULL;
                 break;
         case 's':
                 if (str_equal(action, "shutdown")) {
@@ -550,6 +577,10 @@ static int sv(char **argv)
                         acts = "tcu";
                         break;
                 }
+                if (str_equal(action, "reload")) {
+                        acts = "h";
+                        break;
+                }
                 bb_show_usage();
         case 'f':
                 if (str_equal(action, "force-reload")) {
@@ -578,7 +609,9 @@ static int sv(char **argv)
 
         service = argv;
         while ((x = *service) != NULL) {
-                if (x[0] != '/' && x[0] != '.') {
+                if (x[0] != '/' && x[0] != '.'
+                 && x[0] != '\0' && x[strlen(x) - 1] != '/'
+                ) {
                         if (chdir(varservice) == -1)
                                 goto chdir_failed_0;
                 }
@@ -688,12 +721,7 @@ int svc_main(int argc UNUSED_PARAM, char **argv)
         /* getopt32() was already called:
          * reset the libc getopt() function, which keeps internal state.
          */
-#ifdef __GLIBC__
-        optind = 0;
-#else /* BSD style */
-        optind = 1;
-        /* optreset = 1; */
-#endif
+        GETOPT_RESET();
 
         do {
                 if (opts & 1) {
diff --git a/runit/svlogd.c b/runit/svlogd.c
index 3ed13b67b..795bf48bb 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -137,9 +137,9 @@ log message, you can use a pattern like this instead
 //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"
@@ -339,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),
@@ -1160,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);