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/daemontools-extras/s6-log.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/daemontools-extras') diff --git a/src/daemontools-extras/s6-log.c b/src/daemontools-extras/s6-log.c index e788016..14059c0 100644 --- a/src/daemontools-extras/s6-log.c +++ b/src/daemontools-extras/s6-log.c @@ -30,6 +30,7 @@ #include #include #include +#include #define USAGE "s6-log [ -q | -v ] [ -b ] [ -p ] [ -t ] [ -e ] logging_script" #define dienomem() strerr_diefu1sys(111, "stralloc_catb") @@ -354,7 +355,7 @@ static int finish (logdir_t *ldp, char const *name, char suffix) static inline void exec_processor (logdir_t_ref ldp) { - char const *cargv[4] = { "execlineb", "-Pc", ldp->processor, 0 } ; + char const *cargv[4] = { EXECLINE_EXTBINPREFIX "execlineb", "-Pc", ldp->processor, 0 } ; unsigned int dirlen = str_len(ldp->dir) ; int fd ; char x[dirlen + 10] ; -- cgit v1.2.3