diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2022-06-08 09:59:01 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2022-06-08 09:59:01 +0000 |
| commit | ff147a1493759c0662912564c0ecd26f59590322 (patch) | |
| tree | 0d738aa9d0b1e5476b4fe18a2e935ce1cae730e5 /src/libs6 | |
| parent | 2a47de8defea86ae35ffb53e8c30667be940ac4e (diff) | |
| download | s6-ff147a1493759c0662912564c0ecd26f59590322.tar.xz | |
Prepare for 2.11.1.1; adapt to skalibs-2.12.0.0
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/libs6')
| -rw-r--r-- | src/libs6/s6_accessrules_backend_fs.c | 2 | ||||
| -rw-r--r-- | src/libs6/s6_svstatus_read.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/libs6/s6_accessrules_backend_fs.c b/src/libs6/s6_accessrules_backend_fs.c index 1995757..12948f6 100644 --- a/src/libs6/s6_accessrules_backend_fs.c +++ b/src/libs6/s6_accessrules_backend_fs.c @@ -41,7 +41,7 @@ s6_accessrules_result_t s6_accessrules_backend_fs (char const *key, size_t keyle memcpy(tmp + dirlen + keylen + 2, "exec", 5) ; { ssize_t r = openreadnclose(tmp, params->exec.s + params->exec.len, 4096) ; - if ((r < 0) && (errno != EACCES) && (errno != ENOENT)) + if ((r == -1) && (errno != EACCES) && (errno != ENOENT)) { if (wasnull) stralloc_free(¶ms->env) ; else params->env.len = envbase ; diff --git a/src/libs6/s6_svstatus_read.c b/src/libs6/s6_svstatus_read.c index 376a0c7..9b21d44 100644 --- a/src/libs6/s6_svstatus_read.c +++ b/src/libs6/s6_svstatus_read.c @@ -1,17 +1,22 @@ /* ISC license. */ +#include <errno.h> #include <string.h> + #include <skalibs/djbunix.h> #include <s6/supervise.h> int s6_svstatus_read (char const *dir, s6_svstatus_t *status) { + ssize_t r ; size_t n = strlen(dir) ; char pack[S6_SVSTATUS_SIZE] ; char tmp[n + 1 + sizeof(S6_SVSTATUS_FILENAME)] ; memcpy(tmp, dir, n) ; memcpy(tmp + n, "/" S6_SVSTATUS_FILENAME, 1 + sizeof(S6_SVSTATUS_FILENAME)) ; - if (openreadnclose(tmp, pack, S6_SVSTATUS_SIZE) < S6_SVSTATUS_SIZE) return 0 ; + r = openreadnclose(tmp, pack, S6_SVSTATUS_SIZE) ; + if (r == -1) return 0 ; + if (r < S6_SVSTATUS_SIZE) return (errno = EPIPE, 0) ; s6_svstatus_unpack(pack, status) ; return 1 ; } |