Patch from Bernhard Fischer to make a bunch of symbols static
[oweals/busybox.git] / procps / kill.c
index 3884ebdf4e83485acb8f0b179a183f6792f6bf3d..25a8d012467ac86cde9c236bf07ee4078663c6c3 100644 (file)
@@ -3,6 +3,7 @@
  * Mini kill/killall implementation for busybox
  *
  * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #include <unistd.h>
 #include "busybox.h"
 
-static const int KILL = 0;
-static const int KILLALL = 1;
-
+#define KILL 0
+#define KILLALL 1
 
 extern int kill_main(int argc, char **argv)
 {
-       int whichApp, sig = SIGTERM;
+       int whichApp, signo = SIGTERM;
        const char *name;
+       int errors = 0;
 
-#ifdef BB_KILLALL
+#ifdef CONFIG_KILLALL
+       int quiet=0;
        /* Figure out what we are trying to do here */
-       whichApp = (strcmp(applet_name, "killall") == 0)? KILLALL : KILL; 
+       whichApp = (strcmp(bb_applet_name, "killall") == 0)? KILLALL : KILL;
 #else
        whichApp = KILL;
 #endif
 
-       argc--;
-       argv++;
        /* Parse any options */
-       if (argc < 1)
-               show_usage();
-
-       while (argc > 0 && **argv == '-') {
-               while (*++(*argv)) {
-                       switch (**argv) {
-                       case 'l':
-                               if(argc>1) {
-                                       for(argv++; *argv; argv++) {
-                                               name = u_signal_names(*argv, &sig, -1);
-                                               if(name!=NULL)
-                                                       printf("%s\n", name);
-                                       }
-                               } else {
-                                       int col = 0;
-                                       for(sig=1; sig < NSIG; sig++) {
-                                               name = u_signal_names(0, &sig, 1);
-                                               if(name==NULL)  /* unnamed */
-                                                       continue;
-                                               col += printf("%2d) %-16s", sig, name);
-                                               if (col > 60) {
-                                                       printf("\n");
-                                                       col = 0;
-                                               }
-                                       }
+       if (argc < 2)
+               bb_show_usage();
+
+       if(argv[1][0] != '-'){
+               argv++;
+               argc--;
+               goto do_it_now;
+       }
+
+       /* The -l option, which prints out signal names. */
+       if(argv[1][1]=='l' && argv[1][2]=='\0'){
+               if(argc==2) {
+                       /* Print the whole signal list */
+                       int col = 0;
+                       for(signo=1; signo < NSIG; signo++) {
+                               name = u_signal_names(0, &signo, 1);
+                               if(name==NULL)  /* unnamed */
+                                       continue;
+                               col += printf("%2d) %-16s", signo, name);
+                               if (col > 60) {
                                        printf("\n");
+                                       col = 0;
                                }
-                               return EXIT_SUCCESS;
-                       case '-':
-                               show_usage();
-                       default:
-                               name = u_signal_names(*argv, &sig, 0);
-                               if(name==NULL)
-                                       error_msg_and_die( "bad signal name: %s", *argv);
-                                                               argc--;
-                                                               argv++;
-                                                               goto do_it_now;
-                                                       }
-                       argc--;
-                       argv++;
+                       }
+                       printf("\n");
+
+               } else {
+                       for(argv++; *argv; argv++) {
+                               name = u_signal_names(*argv, &signo, -1);
+                               if(name!=NULL)
+                                       printf("%s\n", name);
+                       }
+               }
+               /* If they specified -l, were all done */
+               return EXIT_SUCCESS;
+       }
+
+#ifdef CONFIG_KILLALL  
+       /* The -q quiet option */
+       if(argv[1][1]=='q' && argv[1][2]=='\0'){
+               quiet++;
+               argv++;
+               argc--;
+               if(argc<2 || argv[1][0] != '-'){
+                       goto do_it_now;
                }
        }
+#endif
 
-  do_it_now:
+       if(!u_signal_names(argv[1]+1, &signo, 0))
+               bb_error_msg_and_die( "bad signal name '%s'", argv[1]+1);
+       argv+=2;
+       argc-=2;
+
+do_it_now:
 
        if (whichApp == KILL) {
                /* Looks like they want to do a kill. Do that */
@@ -101,42 +112,45 @@ extern int kill_main(int argc, char **argv)
                        int pid;
 
                        if (!isdigit(**argv))
-                               perror_msg_and_die( "Bad PID");
+                               bb_error_msg_and_die( "Bad PID '%s'", *argv);
                        pid = strtol(*argv, NULL, 0);
-                       if (kill(pid, sig) != 0) 
-                               perror_msg_and_die( "Could not kill pid '%d'", pid);
+                       if (kill(pid, signo) != 0) {
+                               bb_perror_msg( "Could not kill pid '%d'", pid);
+                               errors++;
+                       }
                        argv++;
                }
-       } 
-#ifdef BB_KILLALL
+
+       }
+#ifdef CONFIG_KILLALL
        else {
-               int all_found = TRUE;
                pid_t myPid=getpid();
                /* Looks like they want to do a killall.  Do that */
                while (--argc >= 0) {
-                       pid_t* pidList;
+                       long* pidList;
 
-                       pidList = find_pid_by_name( *argv);
+                       pidList = find_pid_by_name(*argv);
                        if (!pidList || *pidList<=0) {
-                               all_found = FALSE;
-                               error_msg_and_die( "%s: no process killed", *argv);
-                       }
+                               errors++;
+                               if (quiet==0)
+                                       bb_error_msg( "%s: no process killed", *argv);
+                       } else {
+                               long *pl;
 
-                       for(; pidList && *pidList!=0; pidList++) {
-                               if (*pidList==myPid)
-                                       continue;
-                               if (kill(*pidList, sig) != 0) 
-                                       perror_msg_and_die( "Could not kill pid '%d'", *pidList);
+                               for(pl = pidList; *pl !=0 ; pl++) {
+                                       if (*pl==myPid)
+                                               continue;
+                                       if (kill(*pl, signo) != 0) {
+                                               errors++;
+                                               if (quiet==0)
+                                                       bb_perror_msg( "Could not kill pid '%ld'", *pl);
+                                       }
+                               }
                        }
-                       /* Note that we don't bother to free the memory
-                        * allocated in find_pid_by_name().  It will be freed
-                        * upon exit, so we can save a byte or two */
+                       free(pidList);
                        argv++;
                }
-               if (all_found == FALSE)
-                       return EXIT_FAILURE;
        }
 #endif
-
-       return EXIT_SUCCESS;
+       return errors;
 }