libbb: add xunlink()

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

diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 399f9f5e1c4848799f3885177967802543054877..60a78793e1f7adcec9e4086a1da95c2f985f176a 100644 (file)
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -14,12 +14,11 @@
 
 static int signal_nr = 15;
 static int user_id = -1;
-static int quiet;
 static char *userspec;
-static char *chuid;
 static char *cmdname;
 static char *execname;
 static char *pidfile;
+static smallint quiet;
 
 struct pid_list {
        struct pid_list *next;
@@ -194,7 +193,7 @@ static int do_stop(void)
 }
 
 #if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
-static const struct option ssd_long_options[] = {
+static const struct option long_options[] = {
        { "stop",               0,      NULL,   'K' },
        { "start",              0,      NULL,   'S' },
        { "background",         0,      NULL,   'b' },
@@ -219,50 +218,58 @@ static const struct option ssd_long_options[] = {
 };
 #endif
 
-#define SSD_CTX_STOP            0x1
-#define SSD_CTX_START           0x2
-#define SSD_OPT_BACKGROUND      0x4
-#define SSD_OPT_QUIET           0x8
-#define SSD_OPT_MAKEPID         0x10
-#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
-#define SSD_OPT_OKNODO          0x20
-#define SSD_OPT_VERBOSE         0x40
-#define SSD_OPT_NICELEVEL       0x80
-#endif
+enum {
+       CTX_STOP       = 0x1,
+       CTX_START      = 0x2,
+       OPT_BACKGROUND = 0x4, // -b
+       OPT_QUIET      = 0x8, // -q
+       OPT_MAKEPID    = 0x10, // -m
+       OPT_a          = 0x20, // -a
+       OPT_n          = 0x40, // -n
+       OPT_s          = 0x80, // -s
+       OPT_u          = 0x100, // -u
+       OPT_c          = 0x200, // -c
+       OPT_x          = 0x400, // -x
+       OPT_p          = 0x800, // -p
+       OPT_OKNODO     = 0x1000 * ENABLE_FEATURE_START_STOP_DAEMON_FANCY, // -o
+       OPT_VERBOSE    = 0x2000 * ENABLE_FEATURE_START_STOP_DAEMON_FANCY, // -v
+       OPT_NICELEVEL  = 0x4000 * ENABLE_FEATURE_START_STOP_DAEMON_FANCY, // -N
+};
 
+int start_stop_daemon_main(int argc, char **argv);
 int start_stop_daemon_main(int argc, char **argv)
 {
        unsigned opt;
-       char *signame = NULL;
-       char *startas = NULL;
+       char *signame;
+       char *startas;
+       char *chuid;
 #if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
 //     char *retry_arg = NULL;
 //     int retries = -1;
        char *opt_N;
 #endif
 #if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
-       applet_long_options = ssd_long_options;
+       applet_long_options = long_options;
 #endif
 
        /* Check required one context option was given */
        opt_complementary = "K:S:?:K--S:S--K:m?p:K?xpun:S?xa";
-       opt = getopt32(argc, argv, "KSbqm"
-//             USE_FEATURE_START_STOP_DAEMON_FANCY("ovN:R:")
-               USE_FEATURE_START_STOP_DAEMON_FANCY("ovN:")
-               "a:n:s:u:c:x:p:"
+       opt = getopt32(argc, argv, "KSbqma:n:s:u:c:x:p:"
+               USE_FEATURE_START_STOP_DAEMON_FANCY("ovN:"),
+//             USE_FEATURE_START_STOP_DAEMON_FANCY("ovN:R:"),
+               &startas, &cmdname, &signame, &userspec, &chuid, &execname, &pidfile
                USE_FEATURE_START_STOP_DAEMON_FANCY(,&opt_N)
 //             USE_FEATURE_START_STOP_DAEMON_FANCY(,&retry_arg)
-               ,&startas, &cmdname, &signame, &userspec, &chuid, &execname, &pidfile);
+       );
 
-       quiet = (opt & SSD_OPT_QUIET)
-                       USE_FEATURE_START_STOP_DAEMON_FANCY(&& !(opt & SSD_OPT_VERBOSE));
+       quiet = (opt & OPT_QUIET) && !(opt & OPT_VERBOSE);
 
-       if (signame) {
+       if (opt & OPT_s) {
                signal_nr = get_signum(signame);
                if (signal_nr < 0) bb_show_usage();
        }
 
-       if (!startas)
+       if (!(opt & OPT_a))
                startas = execname;
 
 //     USE_FEATURE_START_STOP_DAEMON_FANCY(
@@ -275,14 +282,12 @@ int start_stop_daemon_main(int argc, char **argv)
        if (userspec) {
                user_id = bb_strtou(userspec, NULL, 10);
                if (errno)
-                       user_id = bb_xgetpwnam(userspec);
+                       user_id = xuname2uid(userspec);
        }
 
-       if (opt & SSD_CTX_STOP) {
+       if (opt & CTX_STOP) {
                int i = do_stop();
-               return
-                       USE_FEATURE_START_STOP_DAEMON_FANCY((opt & SSD_OPT_OKNODO)
-                               ? 0 :) !!(i<=0);
+               return (opt & OPT_OKNODO) ? 0 : (i<=0);
        }
 
        do_procinit();
@@ -290,15 +295,13 @@ int start_stop_daemon_main(int argc, char **argv)
        if (found) {
                if (!quiet)
                        printf("%s already running\n%d\n", execname, found->pid);
-               USE_FEATURE_START_STOP_DAEMON_FANCY(return !(opt & SSD_OPT_OKNODO);)
-               SKIP_FEATURE_START_STOP_DAEMON_FANCY(return EXIT_FAILURE;)
+               return !(opt & OPT_OKNODO);
        }
        *--argv = startas;
-       if (opt & SSD_OPT_BACKGROUND) {
-               xdaemon(0, 0);
-               setsid();
+       if (opt & OPT_BACKGROUND) {
+               bb_daemonize(0);
        }
-       if (opt & SSD_OPT_MAKEPID) {
+       if (opt & OPT_MAKEPID) {
                /* user wants _us_ to make the pidfile */
                FILE *pidf = xfopen(pidfile, "w");
 
@@ -306,14 +309,14 @@ int start_stop_daemon_main(int argc, char **argv)
                fprintf(pidf, "%d\n", pidt);
                fclose(pidf);
        }
-       if (chuid) {
-               user_id = bb_strtou(chuid, NULL, 10);
-               if (errno)
-                       user_id = bb_xgetpwnam(chuid);
-               xsetuid(user_id);
+       if (opt & OPT_c) {
+               struct bb_uidgid_t ugid;
+               parse_chown_usergroup_or_die(&ugid, chuid);
+               if (ugid.gid != (gid_t) -1) xsetgid(ugid.gid);
+               if (ugid.uid != (uid_t) -1) xsetuid(ugid.uid);
        }
 #if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
-       if (opt & SSD_OPT_NICELEVEL) {
+       if (opt & OPT_NICELEVEL) {
                /* Set process priority */
                int prio = getpriority(PRIO_PROCESS, 0) + xatoi_range(opt_N, INT_MIN/2, INT_MAX/2);
                if (setpriority(PRIO_PROCESS, 0, prio) < 0) {