- 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)

1 files changed, 18 insertions, 0 deletions

diff --git a/src/libs6/s6_fdholder_retrieve.c b/src/libs6/s6_fdholder_retrieve.c
new file mode 100644
index 0000000..e2888a9
--- /dev/null
+++ b/src/libs6/s6_fdholder_retrieve.c
@@ -0,0 +1,18 @@
+ /* ISC license. */
+
+#include <errno.h>
+#include <skalibs/tai.h>
+#include <skalibs/unixmessage.h>
+#include <s6/s6-fdholder.h>
+
+int s6_fdholder_retrieve_maybe_delete (s6_fdholder_t *a, char const *id, int dodelete, tain_t const *deadline, tain_t *stamp)
+{
+  unixmessage_t m ;
+  s6_fdholder_retrieve_result_t res ;
+  if (!s6_fdholder_retrieve_maybe_delete_async(a, id, dodelete)) return -1 ;
+  if (!unixmessage_sender_timed_flush(&a->connection.out, deadline, stamp)) return -1 ;
+  if (!unixmessage_timed_receive(&a->connection.in, &m, deadline, stamp)) return -1 ;
+  if (!s6_fdholder_retrieve_cb(&m, &res)) return -1 ;
+  if (res.err) return (errno = res.err, -1) ;
+  return res.fd ;
+}