diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-03-16 16:05:54 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-03-16 16:05:54 +0000 |
| commit | dd74c73772894c6988582eb4aec0fbaf6ed558d5 (patch) | |
| tree | 3f5ea3ce1052c110848ec1071874b6f409ec7986 /src/supervision | |
| parent | e1b328e6da656b241e706600a50a699cddc1703c (diff) | |
| download | s6-dd74c73772894c6988582eb4aec0fbaf6ed558d5.tar.xz | |
- doc fixes
- added -X to s6-notifywhenup
Diffstat (limited to 'src/supervision')
| -rw-r--r-- | src/supervision/s6-notifywhenup.c | 14 | ||||
| -rw-r--r-- | src/supervision/s6-svc.c | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/supervision/s6-notifywhenup.c b/src/supervision/s6-notifywhenup.c index 98f0401..6d66fe1 100644 --- a/src/supervision/s6-notifywhenup.c +++ b/src/supervision/s6-notifywhenup.c @@ -13,7 +13,7 @@ #include <s6/ftrigw.h> #include <s6/s6-supervise.h> -#define USAGE "s6-notifywhenup [ -d fd ] [ -e fifodir ] [ -f ] [ -t timeout ] prog..." +#define USAGE "s6-notifywhenup [ -d fd ] [ -e fifodir ] [ -f ] [ -X ] [ -t timeout ] prog..." #define dieusage() strerr_dieusage(100, USAGE) static int run_child (int fd, char const *fifodir, unsigned int timeout) @@ -50,17 +50,18 @@ int main (int argc, char const *const *argv, char const *const *envp) { unsigned int fd = 1 ; char const *fifodir = "event" ; - int df = 1 ; + int df = 1, fake = 0 ; unsigned int timeout = 0 ; PROG = "s6-notifywhenup" ; { subgetopt_t l = SUBGETOPT_ZERO ; for (;;) { - register int opt = subgetopt_r(argc, argv, "d:e:ft:", &l) ; + register int opt = subgetopt_r(argc, argv, "Xd:e:ft:", &l) ; if (opt == -1) break ; switch (opt) { + case 'X' : fake = 1 ; break ; case 'd' : if (!uint0_scan(l.arg, &fd)) dieusage() ; break ; case 'e' : fifodir = l.arg ; break ; case 'f' : df = 0 ; break ; @@ -87,6 +88,11 @@ int main (int argc, char const *const *argv, char const *const *envp) close(p[0]) ; if (fd_move((int)fd, p[1]) < 0) strerr_diefu1sys(111, "fd_move") ; } + if (fake) + { + write(fd, "\n", 1) ; + close(fd) ; + } pathexec_run(argv[0], argv, envp) ; - strerr_dieexec(111, argv[1]) ; + strerr_dieexec(111, argv[0]) ; } diff --git a/src/supervision/s6-svc.c b/src/supervision/s6-svc.c index d8d2b2b..e9396de 100644 --- a/src/supervision/s6-svc.c +++ b/src/supervision/s6-svc.c @@ -8,7 +8,7 @@ #include <s6/config.h> #include <s6/s6-supervise.h> -#define USAGE "s6-svc [ -D | -U ] [ -t timeout ] [ -abqhkti12pcoduxO ] servicedir" +#define USAGE "s6-svc [ -D | -U ] [ -T timeout ] [ -abqhkti12pcoduxO ] servicedir" #define dieusage() strerr_dieusage(100, USAGE) #define DATASIZE 63 |