diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2019-03-25 18:33:31 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2019-03-25 18:33:31 +0000 |
| commit | 2051574efa08de08488810669b21d15f387aa3e8 (patch) | |
| tree | 06eaa03d3b142aaf0c10a6b7f3d71539e3a36dbe /src | |
| parent | 5b324f2d9eb699f15514f6020d0f7bfa522b29b3 (diff) | |
| download | s6-2051574efa08de08488810669b21d15f387aa3e8.tar.gz s6-2051574efa08de08488810669b21d15f387aa3e8.tar.xz s6-2051574efa08de08488810669b21d15f387aa3e8.zip | |
Reestablish directory checking in s6-svc/s6-svscanctl without commands
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs6/s6_svc_write.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/libs6/s6_svc_write.c b/src/libs6/s6_svc_write.c index 46d3178..fba8021 100644 --- a/src/libs6/s6_svc_write.c +++ b/src/libs6/s6_svc_write.c @@ -7,24 +7,21 @@ int s6_svc_write (char const *fifo, char const *data, size_t datalen) { - if (datalen) + int fd = open_write(fifo) ; + if (fd < 0) switch (errno) + { + case ENXIO : return 0 ; + case ENOENT : + case ENOTDIR : + case EISDIR : return -2 ; + default : return -1 ; + } + if (ndelay_off(fd) == -1) return -1 ; + if (datalen && fd_write(fd, data, datalen) == -1) { - int fd = open_write(fifo) ; - if (fd < 0) switch (errno) - { - case ENXIO : return 0 ; - case ENOENT : - case ENOTDIR : - case EISDIR : return -2 ; - default : return -1 ; - } - if (ndelay_off(fd) == -1) return -1 ; - if (fd_write(fd, data, datalen) == -1) - { - fd_close(fd) ; - return -1 ; - } fd_close(fd) ; + return -1 ; } + fd_close(fd) ; return 1 ; } |