svn commit: trunk/busybox/procps

[vodz at busybox.net]

Author: vodz
Date: 2006-01-25 05:21:08 -0800 (Wed, 25 Jan 2006)
New Revision: 13588

Log:
close bug 638

Modified:
   trunk/busybox/procps/kill.c


Changeset:
Modified: trunk/busybox/procps/kill.c
===================================================================
--- trunk/busybox/procps/kill.c	2006-01-25 11:53:47 UTC (rev 13587)
+++ trunk/busybox/procps/kill.c	2006-01-25 13:21:08 UTC (rev 13588)
@@ -89,7 +89,7 @@
 
 #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 @@
 
 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) {