From 701540827e27a4f07ac725db3ce361d3be0c106f Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 19 Jan 2015 16:11:24 +0000 Subject: - 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) --- src/libs6/s6_fdholder_delete.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/libs6/s6_fdholder_delete.c (limited to 'src/libs6/s6_fdholder_delete.c') diff --git a/src/libs6/s6_fdholder_delete.c b/src/libs6/s6_fdholder_delete.c new file mode 100644 index 0000000..0432421 --- /dev/null +++ b/src/libs6/s6_fdholder_delete.c @@ -0,0 +1,21 @@ + /* ISC license. */ + +#include +#include +#include +#include +#include + +int s6_fdholder_delete (s6_fdholder_t *a, char const *id, tain_t const *deadline, tain_t *stamp) +{ + unixmessage_t m ; + if (!s6_fdholder_delete_async(a, id)) return 0 ; + if (!unixmessage_sender_timed_flush(&a->connection.out, deadline, stamp)) return 0 ; + if (!unixmessage_timed_receive(&a->connection.in, &m, deadline, stamp)) return 0 ; + if (m.len != 1 || m.nfds) + { + unixmessage_drop(&m) ; + return (errno = EPROTO, 0) ; + } + return m.s[0] ? (errno = m.s[0], 0) : 1 ; +} -- cgit v1.2.3