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

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

@@ -28 +28 @@
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
 /* TODO: depends on runit_lib.c - review and reduce/eliminate */
+
+//usage:#define runsv_trivial_usage
+//usage:       "DIR"
+//usage:#define runsv_full_usage "\n\n"
+//usage:       "Start and monitor a service and optionally an appendant log service"
 
 #include <sys/poll.h>
@@ -140 +145 @@
 }
 
-/* libbb candidate */
-static char *bb_stpcpy(char *p, const char *to_add)
-{
-    while ((*p = *to_add) != '\0') {
-        p++;
-        to_add++;
-    }
-    return p;
-}
-
 static int open_trunc_or_warn(const char *name)
 {
@@ -178 +173 @@
         close(fd);
         if (rename_or_warn("supervise/pid.new",
-            s->islog ? "log/supervise/pid" : "log/supervise/pid"+4))
+                s->islog ? "log/supervise/pid" : "log/supervise/pid"+4))
             return;
         pidchanged = 0;
@@ -193 +188 @@
         switch (s->state) {
         case S_DOWN:
-            p = bb_stpcpy(p, "down");
+            p = stpcpy(p, "down");
             break;
         case S_RUN:
-            p = bb_stpcpy(p, "run");
+            p = stpcpy(p, "run");
             break;
         case S_FINISH:
-            p = bb_stpcpy(p, "finish");
+            p = stpcpy(p, "finish");
             break;
         }
         if (s->ctrl & C_PAUSE)
-            p = bb_stpcpy(p, ", paused");
+            p = stpcpy(p, ", paused");
         if (s->ctrl & C_TERM)
-            p = bb_stpcpy(p, ", got TERM");
+            p = stpcpy(p, ", got TERM");
         if (s->state != S_DOWN)
             switch (s->sd_want) {
             case W_DOWN:
-                p = bb_stpcpy(p, ", want down");
+                p = stpcpy(p, ", want down");
                 break;
             case W_EXIT:
-                p = bb_stpcpy(p, ", want exit");
+                p = stpcpy(p, ", want exit");
                 break;
             }