From: Steven Barth <steven@midlink.org>
Date: Tue, 26 Jan 2016 19:29:01 +0000 (+0100)
Subject: Merge pull request #40 from dedeckeh/bugfixes
X-Git-Tag: debian/1.1+git20160131-1~9
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=commitdiff_plain;h=4f9eded5cff092772fdc2bdeafc8647dae826390;hp=dc186d6d2b0dd4ad23ca5fc69c00e81f796ff6d9

Merge pull request #40 from dedeckeh/bugfixes

script: Launch script with correct action if last script call is terminated
---

diff --git a/src/script.c b/src/script.c
index 3d313cf..f272c19 100644
--- a/src/script.c
+++ b/src/script.c
@@ -353,13 +353,15 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len
 void script_call(const char *status, int delay, bool resume)
 {
 	time_t now = odhcp6c_get_milli_time() / 1000;
+	bool running_script = false;
 
 	if (running) {
 		kill(running, SIGTERM);
 		delay -= now - started;
+		running_script = true;
 	}
 
-	if (resume || !action[0])
+	if (resume || !running_script || !action[0])
 		strncpy(action, status, sizeof(action) - 1);
 
 	pid_t pid = fork();