From: Roy Marples <roy@marples.name>
Date: Thu, 19 Oct 2023 11:06:22 +0000 (+0100)
Subject: dhcpcd: Improve script status handling
X-Git-Tag: v10.0.4~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c20aab02574f0f410ac4f4f97174d836eabb4f4;p=thirdparty%2Fdhcpcd.git

dhcpcd: Improve script status handling
---

diff --git a/src/script.c b/src/script.c
index 69297a46..1a61f29d 100644
--- a/src/script.c
+++ b/src/script.c
@@ -700,24 +700,24 @@ static int
 script_run(struct dhcpcd_ctx *ctx, char **argv)
 {
 	pid_t pid;
-	int status = 0;
+	int status;
 
 	pid = script_exec(argv, ctx->script_env);
-	if (pid == -1)
+	if (pid == -1) {
 		logerr("%s: %s", __func__, argv[0]);
-	else if (pid != 0) {
-		/* Wait for the script to finish */
-		while (waitpid(pid, &status, 0) == -1) {
-			if (errno != EINTR) {
-				logerr("%s: waitpid", __func__);
-				status = 0;
-				break;
-			}
+		return -1;
+	} else if (pid == 0)
+		return 0;
+
+	/* Wait for the script to finish */
+	while (waitpid(pid, &status, 0) == -1) {
+		if (errno != EINTR) {
+			logerr("%s: waitpid", __func__);
+			status = 0;
+			break;
 		}
-		status = script_status(argv[0], status);
 	}
-
-	return WEXITSTATUS(status);
+	return script_status(argv[0], status);
 }
 
 int
@@ -771,7 +771,7 @@ script_runreason(const struct interface *ifp, const char *reason)
 	logdebugx("%s: executing: %s %s", ifp->name, argv[0], reason);
 
 #ifdef PRIVSEP
-	if (ctx->options & DHCPCD_PRIVSEP) {
+	if (IN_PRIVSEP(ctx)) {
 		ssize_t err;
 
 		err = ps_root_script(ctx, ctx->script_buf, (size_t)buflen);