[Pkg-sysvinit-commits] r220 - sysvinit/trunk/src

[Thomas Hood]

Author: jdthood-guest
Date: 2005-11-23 18:53:19 +0000 (Wed, 23 Nov 2005)
New Revision: 220

Modified:
   sysvinit/trunk/src/killall5.c
Log:
Don't compare basename with basename.  Only compare fullname with fullname and fullname with basename.

Modified: sysvinit/trunk/src/killall5.c
===================================================================
--- sysvinit/trunk/src/killall5.c	2005-11-23 18:51:00 UTC (rev 219)
+++ sysvinit/trunk/src/killall5.c	2005-11-23 18:53:19 UTC (rev 220)
@@ -411,10 +411,11 @@
 	if (!foundone) for (p = plist; p; p = p->next) {
 		ok = 0;
 
-		/* Compare name (both basename and full path) */
+		/* Compare name */
 		ok |=
 			(p->argv0 && strcmp(p->argv0, prog) == 0)
-			|| (p->argv0base && strcmp(p->argv0base, s) == 0);
+			|| (p->argv0 && s != prog && strcmp(p->argv0, s) == 0)
+			|| (p->argv0base && strcmp(p->argv0base, prog) == 0);
 
 		/* For scripts, compare argv[1] as well. */
 		if (scripts_too && p->argv1 &&