D20509.diff
No OneTemporary
Actions

Size

717 B

Referenced Files

None

Subscribers

None

D20509.diff
View Options

	Index: head/usr.sbin/daemon/daemon.c
	===================================================================
	--- head/usr.sbin/daemon/daemon.c
	+++ head/usr.sbin/daemon/daemon.c
	@@ -359,12 +359,13 @@
	}
	}
	}
	+ if (restart && !terminate)
	+ daemon_sleep(restart, 0);
	if (sigprocmask(SIG_BLOCK, &mask_term, NULL)) {
	warn("sigprocmask");
	goto exit;
	}
	if (restart && !terminate) {
	- daemon_sleep(restart, 0);
	close(pfd[0]);
	pfd[0] = -1;
	goto restart;
	@@ -384,7 +385,8 @@
	daemon_sleep(time_t secs, long nsecs)
	{
	struct timespec ts = { secs, nsecs };
	- while (nanosleep(&ts, &ts) == -1) {
	+
	+ while (!terminate && nanosleep(&ts, &ts) == -1) {
	if (errno != EINTR)
	err(1, "nanosleep");
	}