Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/procps/kill.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/procps/kill.c (modified) (8 diffs)

branches/2.2.9/mindi-busybox/procps/kill.c

@@ -6 +6 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -25 +25 @@
  */
 
-int kill_main(int argc, char **argv);
 int kill_main(int argc, char **argv)
 {
@@ -59 +58 @@
         if (argc == 1) {
             /* Print the whole signal list */
-            for (signo = 1; signo < 32; signo++) {
-                const char *name = get_signame(signo);
-                if (!isdigit(name[0]))
-                    puts(name);
-            }
-        } else { /* -l <sig list> */
-            while ((arg = *++argv)) {
-                if (isdigit(arg[0])) {
-                    signo = bb_strtou(arg, NULL, 10);
-                    if (errno) {
-                        bb_error_msg("unknown signal '%s'", arg);
-                        return EXIT_FAILURE;
-                    }
-                    /* Exitcodes >= 0x80 are to be treated
-                     * as "killed by signal (exitcode & 0x7f)" */
-                    puts(get_signame(signo & 0x7f));
-                    /* TODO: 'bad' signal# - coreutils says:
-                     * kill: 127: invalid signal
-                     * we just print "127" instead */
-                } else {
-                    signo = get_signum(arg);
-                    if (signo < 0) {
-                        bb_error_msg("unknown signal '%s'", arg);
-                        return EXIT_FAILURE;
-                    }
-                    printf("%d\n", signo);
-                }
+            print_signames();
+            return 0;
+        }
+        /* -l <sig list> */
+        while ((arg = *++argv)) {
+            if (isdigit(arg[0])) {
+                signo = bb_strtou(arg, NULL, 10);
+                if (errno) {
+                    bb_error_msg("unknown signal '%s'", arg);
+                    return EXIT_FAILURE;
+                }
+                /* Exitcodes >= 0x80 are to be treated
+                 * as "killed by signal (exitcode & 0x7f)" */
+                puts(get_signame(signo & 0x7f));
+                /* TODO: 'bad' signal# - coreutils says:
+                 * kill: 127: invalid signal
+                 * we just print "127" instead */
+            } else {
+                signo = get_signum(arg);
+                if (signo < 0) {
+                    bb_error_msg("unknown signal '%s'", arg);
+                    return EXIT_FAILURE;
+                }
+                printf("%d\n", signo);
             }
         }
@@ -97 +93 @@
         arg = *++argv;
         argc--;
-        if (argc < 1) bb_show_usage();
-        if (arg[0] != '-') goto do_it_now;
-    }
-
-    /* -SIG */
-    signo = get_signum(&arg[1]);
+        if (argc < 1)
+            bb_show_usage();
+        if (arg[0] != '-')
+            goto do_it_now;
+    }
+
+    arg++; /* skip '-' */
+
+    /* -o PID? (if present, it always is at the end of command line) */
+    if (killall5 && arg[0] == 'o')
+        goto do_it_now;
+
+    if (argc > 1 && arg[0] == 's' && arg[1] == '\0') { /* -s SIG? */
+        argc--;
+        arg = *++argv;
+    } /* else it must be -SIG */
+    signo = get_signum(arg);
     if (signo < 0) { /* || signo > MAX_SIGNUM ? */
-        bb_error_msg("bad signal name '%s'", &arg[1]);
+        bb_error_msg("bad signal name '%s'", arg);
         return EXIT_FAILURE;
     }
@@ -110 +117 @@
     argc--;
 
-do_it_now:
+ do_it_now:
+    pid = getpid();
 
     if (killall5) {
         pid_t sid;
         procps_status_t* p = NULL;
-
-        /* Now stop all processes */
+        int ret = 0;
+
+        /* Find out our session id */
+        sid = getsid(pid);
+        /* Stop all processes */
         kill(-1, SIGSTOP);
-        /* Find out our own session id */
-        pid = getpid();
-        sid = getsid(pid);
-        /* Now kill all processes except our session */
+        /* Signal all processes except those in our session */
         while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_SID))) {
-            if (p->sid != sid && p->pid != pid && p->pid != 1)
-                kill(p->pid, signo);
-        }
+            int i;
+
+            if (p->sid == (unsigned)sid
+             || p->pid == (unsigned)pid
+             || p->pid == 1)
+                continue;
+
+            /* All remaining args must be -o PID options.
+             * Check p->pid against them. */
+            for (i = 0; i < argc; i++) {
+                pid_t omit;
+
+                arg = argv[i];
+                if (arg[0] != '-' || arg[1] != 'o') {
+                    bb_error_msg("bad option '%s'", arg);
+                    ret = 1;
+                    goto resume;
+                }
+                arg += 2;
+                if (!arg[0] && argv[++i])
+                    arg = argv[i];
+                omit = bb_strtoi(arg, NULL, 10);
+                if (errno) {
+                    bb_error_msg("invalid number '%s'", arg);
+                    ret = 1;
+                    goto resume;
+                }
+                if (p->pid == omit)
+                    goto dont_kill;
+            }
+            kill(p->pid, signo);
+ dont_kill: ;
+        }
+ resume:
         /* And let them continue */
         kill(-1, SIGCONT);
-        return 0;
+        return ret;
     }
 
     /* Pid or name is required for kill/killall */
     if (argc < 1) {
-        puts("You need to specify whom to kill");
+        bb_error_msg("you need to specify whom to kill");
         return EXIT_FAILURE;
     }
@@ -139 +178 @@
     if (killall) {
         /* Looks like they want to do a killall.  Do that */
-        pid = getpid();
         while (arg) {
             pid_t* pidList;
@@ -158 +196 @@
                     errors++;
                     if (!quiet)
-                        bb_perror_msg("cannot kill pid %u", (unsigned)*pl);
+                        bb_perror_msg("can't kill pid %d", (int)*pl);
                 }
             }
@@ -174 +212 @@
         pid = bb_strtoi(arg, NULL, 10);
         if (errno) {
-            bb_error_msg("bad pid '%s'", arg);
+            bb_error_msg("invalid number '%s'", arg);
             errors++;
         } else if (kill(pid, signo) != 0) {
-            bb_perror_msg("cannot kill pid %d", (int)pid);
+            bb_perror_msg("can't kill pid %d", (int)pid);
             errors++;
         }