find: improve usage text (Natanael Copa <natanael.copa@gmail.com>)

[oweals/busybox.git] / procps / kill.c

diff --git a/procps/kill.c b/procps/kill.c
index 2408a70ca16417aed3d9d3221fe719a9682024c4..9a6e936655fdb09e26e824d0155fea159cad4a91 100644 (file)
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -10,31 +10,32 @@
 
 #include "busybox.h"
 
+int kill_main(int argc, char **argv);
 int kill_main(int argc, char **argv)
 {
        char *arg;
        pid_t pid;
        int signo = SIGTERM, errors = 0, quiet = 0;
-       const int killall = (ENABLE_KILLALL && applet_name[4]=='a'
-                      && (!ENABLE_KILLALL5 || applet_name[7]!='5'));
-       const int killall5 = (ENABLE_KILLALL5 && applet_name[4]=='a'
-                         && (!ENABLE_KILLALL || applet_name[7]=='5'));
+       const int killall = (ENABLE_KILLALL && applet_name[4] == 'a'
+                      && (!ENABLE_KILLALL5 || applet_name[7] != '5'));
+       const int killall5 = (ENABLE_KILLALL5 && applet_name[4] == 'a'
+                         && (!ENABLE_KILLALL || applet_name[7] == '5'));
 
        /* Parse any options */
        argc--;
        arg = *++argv;
 
-       if (argc<1 || arg[0]!='-') {
+       if (argc < 1 || arg[0] != '-') {
                goto do_it_now;
        }
 
        /* The -l option, which prints out signal names. */
-       if (arg[1]=='l' && arg[2]=='\0') {
+       if (arg[1] == 'l' && arg[2] == '\0') {
                const char *name;
-               if (argc==1) {
+               if (argc == 1) {
                        /* Print the whole signal list */
                        int col = 0;
-                       for (signo = 1; signo<32; signo++) {
+                       for (signo = 1; signo < 32; signo++) {
                                name = get_signame(signo);
                                if (isdigit(name[0])) continue;
                                if (col > 66) {
@@ -45,13 +46,13 @@ int kill_main(int argc, char **argv)
                        }
                        puts("");
                } else { /* -l <sig list> */
-                       while ((arg = *++argv)!=NULL) {
+                       while ((arg = *++argv)) {
                                if (isdigit(arg[0])) {
-                                       signo = atoi(arg);
+                                       signo = xatoi_u(arg);
                                        name = get_signame(signo);
                                } else {
                                        signo = get_signum(arg);
-                                       if (signo<0)
+                                       if (signo < 0)
                                                bb_error_msg_and_die("unknown signal '%s'", arg);
                                        name = get_signame(signo);
                                }
@@ -63,17 +64,17 @@ int kill_main(int argc, char **argv)
        }
 
        /* The -q quiet option */
-       if (killall && arg[1]=='q' && arg[2]=='\0') {
+       if (killall && arg[1] == 'q' && arg[2] == '\0') {
                quiet = 1;
                arg = *++argv;
                argc--;
-               if (argc<1) bb_show_usage();
-               if (arg[0]!='-') goto do_it_now;
+               if (argc < 1) bb_show_usage();
+               if (arg[0] != '-') goto do_it_now;
        }
 
        /* -SIG */
        signo = get_signum(&arg[1]);
-       if (signo<0)
+       if (signo < 0)
                bb_error_msg_and_die("bad signal name '%s'", &arg[1]);
        arg = *++argv;
        argc--;
@@ -82,19 +83,20 @@ do_it_now:
 
        if (killall5) {
                pid_t sid;
-               procps_status_t* p;
+               procps_status_t* p = NULL;
 
-               /* kill(-1, sig) on Linux (at least 2.1.x)
-                * might send signal to the calling process too */
-               signal(SIGTERM, SIG_IGN);
+// Cannot happen anyway? We don't TERM ourself, we STOP
+//             /* kill(-1, sig) on Linux (at least 2.1.x)
+//              * might send signal to the calling process too */
+//             signal(SIGTERM, SIG_IGN);
                /* Now stop all processes */
                kill(-1, SIGSTOP);
                /* Find out our own session id */
                pid = getpid();
                sid = getsid(pid);
                /* Now kill all processes except our session */
-               while ((p = procps_scan(0))!=0) {
-                       if (getsid(p->pid)!=sid && p->pid!=pid && p->pid!=1)
+               while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_SID))) {
+                       if (p->sid != sid && p->pid != pid && p->pid != 1)
                                kill(p->pid, signo);
                }
                /* And let them continue */
@@ -103,31 +105,31 @@ do_it_now:
        }
 
        /* Pid or name required for kill/killall */
-       if (argc<1)
+       if (argc < 1)
                bb_show_usage();
 
        if (killall) {
                /* Looks like they want to do a killall.  Do that */
                pid = getpid();
                while (arg) {
-                       long* pidList;
+                       pid_t* pidList;
 
                        pidList = find_pid_by_name(arg);
-                       if (!pidList || *pidList<=0) {
+                       if (*pidList == 0) {
                                errors++;
                                if (!quiet)
                                        bb_error_msg("%s: no process killed", arg);
                        } else {
-                               long *pl;
+                               pid_t *pl;
 
-                               for (pl = pidList; *pl!=0; pl++) {
-                                       if (*pl==pid)
+                               for (pl = pidList; *pl; pl++) {
+                                       if (*pl == pid)
                                                continue;
-                                       if (kill(*pl, signo)!=0) {
-                                               errors++;
-                                               if (!quiet)
-                                                       bb_perror_msg("cannot kill pid %ld", *pl);
-                                       }
+                                       if (kill(*pl, signo) == 0)
+                                               continue;
+                                       errors++;
+                                       if (!quiet)
+                                               bb_perror_msg("cannot kill pid %u", (unsigned)*pl);
                                }
                        }
                        free(pidList);
@@ -138,12 +140,14 @@ do_it_now:
 
        /* Looks like they want to do a kill. Do that */
        while (arg) {
-               if (!isdigit(arg[0]) && arg[0]!='-')
+               /* Huh?
+               if (!isdigit(arg[0]) && arg[0] != '-')
                        bb_error_msg_and_die("bad pid '%s'", arg);
-               pid = strtol(arg, NULL, 0);
+               */
+               pid = xatou(arg);
                /* FIXME: better overflow check? */
-               if (kill(pid, signo)!=0) {
-                       bb_perror_msg("cannot kill pid %ld", (long)pid);
+               if (kill(pid, signo) != 0) {
+                       bb_perror_msg("cannot kill pid %u", (unsigned)pid);
                        errors++;
                }
                arg = *++argv;