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

branches/3.3/mindi-busybox/debianutils/start_stop_daemon.c

@@ -57 +57 @@
         -v,--verbose            Verbose
 */
+//config:config START_STOP_DAEMON
+//config:   bool "start-stop-daemon"
+//config:   default y
+//config:   help
+//config:     start-stop-daemon is used to control the creation and
+//config:     termination of system-level processes, usually the ones
+//config:     started during the startup of the system.
+//config:
+//config:config FEATURE_START_STOP_DAEMON_FANCY
+//config:   bool "Support additional arguments"
+//config:   default y
+//config:   depends on START_STOP_DAEMON
+//config:   help
+//config:     Support additional arguments.
+//config:     -o|--oknodo ignored since we exit with 0 anyway
+//config:     -v|--verbose
+//config:     -N|--nicelevel N
+//config:
+//config:config FEATURE_START_STOP_DAEMON_LONG_OPTIONS
+//config:   bool "Enable long options"
+//config:   default y
+//config:   depends on START_STOP_DAEMON && LONG_OPTS
+//config:   help
+//config:     Support long options for the start-stop-daemon applet.
+
+//applet:IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, BB_DIR_SBIN, BB_SUID_DROP, start_stop_daemon))
+
+//kbuild:lib-$(CONFIG_START_STOP_DAEMON) += start_stop_daemon.o
 
 //usage:#define start_stop_daemon_trivial_usage
@@ -126 +154 @@
 #define WANT_PIDFILE 1
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 struct pid_list {
@@ -164 +193 @@
     smallint signal_nr;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define userspec          (G.userspec            )
 #define cmdname           (G.cmdname             )
@@ -172 +201 @@
 #define signal_nr         (G.signal_nr           )
 #define INIT_G() do { \
+    setup_common_bufsiz(); \
     user_id = -1; \
     signal_nr = 15; \
@@ -512 +542 @@
     }
     if (opt & OPT_c) {
-        struct bb_uidgid_t ugid = { -1, -1 };
+        struct bb_uidgid_t ugid;
         parse_chown_usergroup_or_die(&ugid, chuid);
-        if (ugid.uid != (uid_t) -1) {
+        if (ugid.uid != (uid_t) -1L) {
             struct passwd *pw = xgetpwuid(ugid.uid);
-            if (ugid.gid != (gid_t) -1)
+            if (ugid.gid != (gid_t) -1L)
                 pw->pw_gid = ugid.gid;
             /* initgroups, setgid, setuid: */
             change_identity(pw);
-        } else if (ugid.gid != (gid_t) -1) {
+        } else if (ugid.gid != (gid_t) -1L) {
             xsetgid(ugid.gid);
             setgroups(1, &ugid.gid);