Sort more misplaced applets into coreutils or util-linux

[oweals/busybox.git] / debianutils / start_stop_daemon.c

diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 495ed0a0930468245ce73ac2ff209368de444dc4..4a9e0653e29a8da9a5a9c519fccab74e654490ae 100644 (file)
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -31,7 +31,8 @@ Options controlling process matching
 [TODO: can PROCESS_NAME be a full pathname? Should we require full match then
 with /proc/$PID/exe or argv[0] (comm can't be matched, it never contains path)]
         -x,--exec EXECUTABLE    Look for processes that were started with this
-                                command in /proc/$PID/cmdline.
+                                command in /proc/$PID/exe and /proc/$PID/cmdline
+                                (/proc/$PID/cmdline is a bbox extension)
                                 Unlike -n, we match against the full path:
                                 "ntpd" != "./ntpd" != "/path/to/ntpd"
         -p,--pidfile PID_FILE   Look for processes with PID from this file
@@ -55,6 +56,31 @@ Misc options:
         -q,--quiet              Quiet
         -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_LONG_OPTIONS
+//config:      bool "Enable long options"
+//config:      default y
+//config:      depends on START_STOP_DAEMON && LONG_OPTS
+//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:        -o|--oknodo ignored since we exit with 0 anyway
+//config:        -v|--verbose
+//config:        -N|--nicelevel N
+
+//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
 //usage:       "[OPTIONS] [-S|-K] ... [-- ARGS...]"
@@ -68,7 +94,7 @@ Misc options:
 //usage:     "\n       -n,--name NAME          Match processes with NAME"
 //usage:     "\n                               in comm field in /proc/PID/stat"
 //usage:     "\n       -x,--exec EXECUTABLE    Match processes with this command"
-//usage:     "\n                               in /proc/PID/cmdline"
+//usage:     "\n                               in /proc/PID/{exe,cmdline}"
 //usage:     "\n       -p,--pidfile FILE       Match a process with PID from the file"
 //usage:     "\n       All specified conditions must match"
 //usage:     "\n-S only:"
@@ -124,6 +150,7 @@ Misc options:
 /* Override ENABLE_FEATURE_PIDFILE */
 #define WANT_PIDFILE 1
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 struct pid_list {
        struct pid_list *next;
@@ -162,7 +189,7 @@ struct globals {
        int user_id;
        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             )
 #define execname          (G.execname            )
@@ -170,6 +197,7 @@ struct globals {
 #define user_id           (G.user_id             )
 #define signal_nr         (G.signal_nr           )
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        user_id = -1; \
        signal_nr = 15; \
 } while (0)
@@ -198,8 +226,18 @@ static int pid_is_exec(pid_t pid)
 {
        ssize_t bytes;
        char buf[sizeof("/proc/%u/cmdline") + sizeof(int)*3];
+       char *procname, *exelink;
+       int match;
 
-       sprintf(buf, "/proc/%u/cmdline", (unsigned)pid);
+       procname = buf + sprintf(buf, "/proc/%u/exe", (unsigned)pid) - 3;
+
+       exelink = xmalloc_readlink(buf);
+       match = (exelink && strcmp(execname, exelink) == 0);
+       free(exelink);
+       if (match)
+               return match;
+
+       strcpy(procname, "cmdline");
        bytes = open_read_close(buf, G.execname_cmpbuf, G.execname_sizeof);
        if (bytes > 0) {
                G.execname_cmpbuf[bytes] = '\0';
@@ -500,15 +538,15 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
                write_pidfile(pidfile);
        }
        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);
                }