close bug 638

1 files changed, 5 insertions, 1 deletions

diff --git a/procps/kill.c b/procps/kill.c
index 2d4e6deb4..ff620eef4 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -89,7 +89,7 @@ extern int kill_main(int argc, char **argv)
 
 #ifdef CONFIG_KILLALL
         /* The -q quiet option */
-        if(argv[1][1]=='q' && argv[1][2]=='\0'){
+        if(whichApp != KILL && argv[1][1]=='q' && argv[1][2]=='\0'){
                 quiet++;
                 argv++;
                 argc--;
@@ -106,6 +106,10 @@ extern int kill_main(int argc, char **argv)
 
 do_it_now:
 
+        /* Pid or name required */
+        if (argc <= 0)
+                bb_show_usage();
+
         if (whichApp == KILL) {
                 /* Looks like they want to do a kill. Do that */
                 while (--argc >= 0) {