summaryrefslogtreecommitdiff
path: root/src/supervision
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-06-25 18:16:43 +0000
committerLaurent Bercot <ska@appnovation.com>2023-06-25 18:16:43 +0000
commit803eb463a54c54bb623176573c51f382f52ee9a9 (patch)
tree23a004cf5345773bcd5d270259579ea63cfcfab9 /src/supervision
parenteba790dff930c232d6b5266fdfda0b1231167609 (diff)
downloads6-803eb463a54c54bb623176573c51f382f52ee9a9.tar.xz
Loosen nonzero servicedirs requirement on s6-svwait/s6-svlisten
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/supervision')
-rw-r--r--src/supervision/s6-svlisten.c4
-rw-r--r--src/supervision/s6-svwait.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/supervision/s6-svlisten.c b/src/supervision/s6-svlisten.c
index 205a382..2ab1d9b 100644
--- a/src/supervision/s6-svlisten.c
+++ b/src/supervision/s6-svlisten.c
@@ -9,6 +9,7 @@
#include <skalibs/strerr.h>
#include <skalibs/djbunix.h>
#include <skalibs/selfpipe.h>
+#include <skalibs/exec.h>
#include <s6/compat.h>
#include "s6-svlisten.h"
@@ -49,8 +50,9 @@ int main (int argc, char const **argv, char const *const *envp)
}
if (argc < 3) dieusage() ;
argc1 = s6_el_semicolon(argv) ;
- if (!argc1 || argc == argc1 + 1) dieusage() ;
+ if (argc == argc1 + 1) dieusage() ;
if (argc1 >= argc) strerr_dief1x(100, "unterminated servicedir block") ;
+ if (!argc1) xexec(argv + argc1 + 1) ;
if (wantup == 2 && or)
{
or = 0 ;
diff --git a/src/supervision/s6-svwait.c b/src/supervision/s6-svwait.c
index 2c7a312..78f5c3f 100644
--- a/src/supervision/s6-svwait.c
+++ b/src/supervision/s6-svwait.c
@@ -45,7 +45,7 @@ int main (int argc, char const *const *argv)
argc -= l.ind ; argv += l.ind ;
if (t) tain_from_millisecs(&deadline, t) ; else deadline = tain_infinite_relative ;
}
- if (!argc) dieusage() ;
+ if (!argc) return 0 ;
tain_now_set_stopwatch_g() ;
tain_add_g(&deadline, &deadline) ;