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

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

@@ -27 +27 @@
 
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
-/* TODO: depends on runit_lib.c - review and reduce/eliminate */
+
+//config:config RUNSV
+//config:   bool "runsv"
+//config:   default y
+//config:   help
+//config:     runsv starts and monitors a service and optionally an appendant log
+//config:     service.
+
+//applet:IF_RUNSV(APPLET(runsv, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_RUNSV) += runsv.o
 
 //usage:#define runsv_trivial_usage
@@ -34 +44 @@
 //usage:       "Start and monitor a service and optionally an appendant log service"
 
-#include <sys/poll.h>
 #include <sys/file.h>
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "runit_lib.h"
 
@@ -51 +61 @@
 static void gettimeofday_ns(struct timespec *ts)
 {
-    if (sizeof(struct timeval) == sizeof(struct timespec)
-     && sizeof(((struct timeval*)ts)->tv_usec) == sizeof(ts->tv_nsec)
-    ) {
-        /* Cheat */
-        gettimeofday((void*)ts, NULL);
-        ts->tv_nsec *= 1000;
-    } else {
-        extern void BUG_need_to_implement_gettimeofday_ns(void);
-        BUG_need_to_implement_gettimeofday_ns();
-    }
+    BUILD_BUG_ON(sizeof(struct timeval) != sizeof(struct timespec));
+    BUILD_BUG_ON(sizeof(((struct timeval*)ts)->tv_usec) != sizeof(ts->tv_nsec));
+    /* Cheat */
+    gettimeofday((void*)ts, NULL);
+    ts->tv_nsec *= 1000;
 }
 #endif
@@ -102 +107 @@
     struct svdir svd[2];
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define haslog       (G.haslog      )
 #define sigterm      (G.sigterm     )
@@ -111 +116 @@
 #define svd          (G.svd         )
 #define INIT_G() do { \
+    setup_common_bufsiz(); \
     pidchanged = 1; \
 } while (0)
@@ -116 +122 @@
 static void fatal2_cannot(const char *m1, const char *m2)
 {
-    bb_perror_msg_and_die("%s: fatal: cannot %s%s", dir, m1, m2);
+    bb_perror_msg_and_die("%s: fatal: can't %s%s", dir, m1, m2);
     /* was exiting 111 */
 }
@@ -126 +132 @@
 static void fatal2x_cannot(const char *m1, const char *m2)
 {
-    bb_error_msg_and_die("%s: fatal: cannot %s%s", dir, m1, m2);
+    bb_error_msg_and_die("%s: fatal: can't %s%s", dir, m1, m2);
     /* was exiting 111 */
 }