From: Roy Marples <roy@marples.name>
Date: Wed, 4 Mar 2015 20:03:22 +0000 (+0000)
Subject: Fix signal handling
X-Git-Tag: v6.8.0~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32d64f990b0a5c9272a4888f77ca63052bb75558;p=thirdparty%2Fdhcpcd.git

Fix signal handling
---

diff --git a/eloop.c b/eloop.c
index 0aaf4689..f9cfdfad 100644
--- a/eloop.c
+++ b/eloop.c
@@ -383,7 +383,7 @@ eloop_requeue(struct eloop_ctx *ctx)
 		return -1;
 
 	i = 0;
-	while ((int)i < dhcpcd_handlesigs[i])
+	while (dhcpcd_handlesigs[i])
 		i++;
 	TAILQ_FOREACH(e, &ctx->events, next) {
 		i++;
@@ -394,7 +394,7 @@ eloop_requeue(struct eloop_ctx *ctx)
 	if ((ke = malloc(sizeof(*ke) * i)) == NULL)
 		return -1;
 
-	for (i = 0; (int)i < dhcpcd_handlesigs[i]; i++)
+	for (i = 0; dhcpcd_handlesigs[i]; i++)
 		EV_SET(&ke[i], dhcpcd_handlesigs[i],
 		    EVFILT_SIGNAL, EV_ADD, 0, 0, UPTR(NULL));
 
diff --git a/script.c b/script.c
index 22bd4dc0..7634c939 100644
--- a/script.c
+++ b/script.c
@@ -112,7 +112,7 @@ exec_script(U const struct dhcpcd_ctx *ctx, char *const *argv, char *const *env)
 	flags = POSIX_SPAWN_SETSIGMASK | POSIX_SPAWN_SETSIGDEF;
 	posix_spawnattr_setflags(&attr, flags);
 	sigemptyset(&defsigs);
-	for (i = 0; i < dhcpcd_handlesigs[i]; i++)
+	for (i = 0; dhcpcd_handlesigs[i]; i++)
 		sigaddset(&defsigs, dhcpcd_handlesigs[i]);
 	posix_spawnattr_setsigdefault(&attr, &defsigs);
 	posix_spawnattr_setsigmask(&attr, &ctx->sigset);