From: Roy Marples <roy@marples.name>
Date: Sat, 9 May 2009 14:15:31 +0000 (+0000)
Subject: Fix dhcpcd -n $int starting a new instance of dhcpcd if not running.
X-Git-Tag: v5.0.2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83a5df47036c9f5a98ef917da49db56b2fa9efa6;p=thirdparty%2Fdhcpcd.git

Fix dhcpcd -n $int starting a new instance of dhcpcd if not running.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 52fc9b80..358df647 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1596,31 +1596,31 @@ main(int argc, char **argv)
 		    PACKAGE " will not work correctly unless run as root");
 
 	if (sig != 0) {
-		i = -1;
 		pid = read_pid();
 		if (pid != 0)
 			syslog(LOG_INFO, "sending signal %d to pid %d",
 			    sig, pid);
-
-		if (!pid || (i = kill(pid, sig))) {
+		if (pid == 0 || kill(pid, sig) != 0) {
 			if (sig != SIGALRM)
 				syslog(LOG_ERR, ""PACKAGE" not running");
 			unlink(pidfile);
-			exit(EXIT_FAILURE);
-		}
-		if (sig == SIGALRM)
-			exit(EXIT_SUCCESS);
-		/* Spin until it exits */
-		syslog(LOG_INFO, "waiting for pid %d to exit", pid);
-		ts.tv_sec = 0;
-		ts.tv_nsec = 100000000; /* 10th of a second */
-		for(i = 0; i < 100; i++) {
-			nanosleep(&ts, NULL);
-			if (read_pid() == 0)
+			if (sig != SIGALRM)
+				exit(EXIT_FAILURE);
+		} else {
+			if (sig == SIGALRM)
 				exit(EXIT_SUCCESS);
+			/* Spin until it exits */
+			syslog(LOG_INFO, "waiting for pid %d to exit", pid);
+			ts.tv_sec = 0;
+			ts.tv_nsec = 100000000; /* 10th of a second */
+			for(i = 0; i < 100; i++) {
+				nanosleep(&ts, NULL);
+				if (read_pid() == 0)
+					exit(EXIT_SUCCESS);
+			}
+			syslog(LOG_ERR, "pid %d failed to exit", pid);
+			exit(EXIT_FAILURE);
 		}
-		syslog(LOG_ERR, "pid %d failed to exit", pid);
-		exit(EXIT_FAILURE);
 	}
 
 	if (!(options & DHCPCD_TEST)) {