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/daemontools-extras | |
| 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/daemontools-extras')
| -rw-r--r-- | src/daemontools-extras/s6-log.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 <skalibs/selfpipe.h> #include <skalibs/skamisc.h> #include <skalibs/environ.h> +#include <execline/config.h> #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] ; |