diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-20 00:09:01 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-20 00:09:01 +0000 |
| commit | b4794e59c5acfb3d9103bc8732295adb47643346 (patch) | |
| tree | 9ce2fe026ca08b4cd4e4b2d8361a852eb12421bb | |
| parent | 6199d6b19810fb50b6f3dce3c59c3015d5c2236d (diff) | |
| download | s6-networking-b4794e59c5acfb3d9103bc8732295adb47643346.tar.xz | |
Test a shutdown in s6-sudoc, see if it helps the BSDs
| -rw-r--r-- | src/conn-tools/s6-ioconnect.c | 4 | ||||
| -rw-r--r-- | src/conn-tools/s6-sudoc.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/conn-tools/s6-ioconnect.c b/src/conn-tools/s6-ioconnect.c index e687d70..747a583 100644 --- a/src/conn-tools/s6-ioconnect.c +++ b/src/conn-tools/s6-ioconnect.c @@ -1,7 +1,6 @@ /* ISC license. */ -#include <sys/types.h> -#include <sys/param.h> +#include <skalibs/nonposix.h> #include <sys/socket.h> #include <errno.h> #include <signal.h> @@ -108,7 +107,6 @@ int main (int argc, char const *const *argv) if (!iobuffer_init(&b[i], a[i][0].fd, a[i][1].fd) < 0) strerr_diefu1sys(111, "iobuffer_init") ; } if (sig_ignore(SIGPIPE) == -1) strerr_diefu1sys(111, "sig_ignore") ; - tain_now_g() ; x[0].fd = selfpipe_init() ; if (x[0].fd < 0) strerr_diefu1sys(111, "selfpipe_init") ; diff --git a/src/conn-tools/s6-sudoc.c b/src/conn-tools/s6-sudoc.c index 823d7cb..46541fb 100644 --- a/src/conn-tools/s6-sudoc.c +++ b/src/conn-tools/s6-sudoc.c @@ -1,5 +1,7 @@ /* ISC license. */ +#include <skalibs/nonposix.h> +#include <sys/socket.h> #include <errno.h> #include <fcntl.h> #include <signal.h> @@ -91,6 +93,7 @@ int main (int argc, char const *const *argv, char const *const *envp) if (!unixmessage_sender_timed_flush_g(&b7, &deadline)) strerr_diefu1sys(111, "send args to server") ; unixmessage_sender_free(&b7) ; + shutdown(7, SHUT_WR) ; { char c ; if (buffer_timed_get_g(&b6, &c, 1, &deadline) < 1) |