diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-01-19 16:11:24 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-01-19 16:11:24 +0000 |
| commit | 701540827e27a4f07ac725db3ce361d3be0c106f (patch) | |
| tree | 98c4b2fb8ba8f69ef791feebdcd61cd5bca34140 /src/libs6/s6_svstatus_unpack.c | |
| parent | 83853a80eb18238796154164f9ea776b0c167ab7 (diff) | |
| download | s6-701540827e27a4f07ac725db3ce361d3be0c106f.tar.xz | |
- added the s6_fdholder library to libs6. (Nothing useful yet.)
- fixed execline invocation in s6-log with slashpackage
- integrated s6_svc_main.c's functionality into s6-svscanctl and deleted it
- integrated Olivier Brunel's suggestions for wstat report in supervise/status
- minor fixes to s6-supervise's status reports
- separated sigaction calls in ftrigw_notifyb, this spares a few syscalls in s6-supervise
- updated doc to reflect the changes
- version bumped to 2.1.0.0 because API breakage (./finish, s6-svstat)
Diffstat (limited to 'src/libs6/s6_svstatus_unpack.c')
| -rw-r--r-- | src/libs6/s6_svstatus_unpack.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libs6/s6_svstatus_unpack.c b/src/libs6/s6_svstatus_unpack.c index cce6989..3fbc205 100644 --- a/src/libs6/s6_svstatus_unpack.c +++ b/src/libs6/s6_svstatus_unpack.c @@ -1,15 +1,19 @@ /* ISC license. */ #include <skalibs/uint32.h> +#include <skalibs/uint64.h> #include <skalibs/tai.h> #include <s6/s6-supervise.h> -void s6_svstatus_unpack (char const *pack, s6_svstatus_t_ref sv) +void s6_svstatus_unpack (char const *pack, s6_svstatus_t *sv) { uint32 pid ; + uint64 wstat ; tain_unpack(pack, &sv->stamp) ; uint32_unpack(pack + 12, &pid) ; - sv->pid = (int)pid ; + sv->pid = (unsigned int)pid ; + uint64_unpack(pack + 18, &wstat) ; + sv->wstat = (unsigned int)wstat ; sv->flagpaused = pack[16] & 1 ; sv->flagfinishing = (pack[16] >> 1) & 1 ; switch (pack[17]) |