diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-01-26 22:26:57 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-01-26 22:26:57 +0000 |
| commit | 8bffa1c19fd05f4f04dad4b5b98f85b94f23113c (patch) | |
| tree | f4e25c3cdb7118db02a06c85b7862107a2074ba4 /src/libs6 | |
| parent | 49cb17940e403431566dc7b5a312624f14eb25d0 (diff) | |
| download | s6-8bffa1c19fd05f4f04dad4b5b98f85b94f23113c.tar.xz | |
- added s6-fdholder-delete(c)
- small s6-fdholder-* fixes
- s6-fdholder documentation (in review)
- s6_svstatus_* bugfix (thanks Olivier Brunel)
Diffstat (limited to 'src/libs6')
| -rw-r--r-- | src/libs6/s6_svstatus_read.c | 4 | ||||
| -rw-r--r-- | src/libs6/s6_svstatus_write.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libs6/s6_svstatus_read.c b/src/libs6/s6_svstatus_read.c index 59a31a5..334dc47 100644 --- a/src/libs6/s6_svstatus_read.c +++ b/src/libs6/s6_svstatus_read.c @@ -8,9 +8,9 @@ int s6_svstatus_read (char const *dir, s6_svstatus_t *status) { unsigned int n = str_len(dir) ; char pack[S6_SVSTATUS_SIZE] ; - char tmp[n + 2 + sizeof(S6_SVSTATUS_FILENAME)] ; + char tmp[n + 1 + sizeof(S6_SVSTATUS_FILENAME)] ; byte_copy(tmp, n, dir) ; - byte_copy(tmp + n, 2 + sizeof(S6_SVSTATUS_FILENAME), "/" S6_SVSTATUS_FILENAME) ; + byte_copy(tmp + n, 1 + sizeof(S6_SVSTATUS_FILENAME), "/" S6_SVSTATUS_FILENAME) ; if (openreadnclose(tmp, pack, S6_SVSTATUS_SIZE) < S6_SVSTATUS_SIZE) return 0 ; s6_svstatus_unpack(pack, status) ; return 1 ; diff --git a/src/libs6/s6_svstatus_write.c b/src/libs6/s6_svstatus_write.c index 2cc8a7b..e07d744 100644 --- a/src/libs6/s6_svstatus_write.c +++ b/src/libs6/s6_svstatus_write.c @@ -8,9 +8,9 @@ int s6_svstatus_write (char const *dir, s6_svstatus_t const *status) { unsigned int n = str_len(dir) ; char pack[S6_SVSTATUS_SIZE] ; - char tmp[n + 2 + sizeof(S6_SVSTATUS_FILENAME)] ; + char tmp[n + 1 + sizeof(S6_SVSTATUS_FILENAME)] ; byte_copy(tmp, n, dir) ; - byte_copy(tmp + n, 2 + sizeof(S6_SVSTATUS_FILENAME), "/" S6_SVSTATUS_FILENAME) ; + byte_copy(tmp + n, 1 + sizeof(S6_SVSTATUS_FILENAME), "/" S6_SVSTATUS_FILENAME) ; s6_svstatus_pack(pack, status) ; return openwritenclose_suffix(tmp, pack, S6_SVSTATUS_SIZE, ".new") ; } |