diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2019-12-23 13:05:25 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2019-12-23 13:05:25 +0000 |
| commit | 07491df186d562d0efa6a7fca2b7f8d07dbd0652 (patch) | |
| tree | d66a8709a82b4c621c5f21a7f346362e8a243a3f /src/pipe-tools | |
| parent | 8bbfc319248c0cbeb57edc45f26d1c972d32f505 (diff) | |
| download | s6-07491df186d562d0efa6a7fca2b7f8d07dbd0652.tar.gz s6-07491df186d562d0efa6a7fca2b7f8d07dbd0652.tar.xz s6-07491df186d562d0efa6a7fca2b7f8d07dbd0652.zip | |
Make execline dependency optional
This includes: - adding a configure option to disable execline support - duplicating el_semicolon() and el_getstrict() into the s6 library when execline is disabled at build time, making a compat shim and using it where needed (s6-svlisten, s6-ftrig-listen) - Creating alternatives for execlineb script spawning: * s6-log: '?' directive (done in the previous commit) * s6-notifyoncheck: require hardcoding the check in ./data/check * s6-ipcserver-access: no support for exec files, add a warning - Updating the relevant parts of the doc --enable-execline will remain the default, and whiners can choke on their tears.
Diffstat (limited to 'src/pipe-tools')
| -rw-r--r-- | src/pipe-tools/deps-exe/s6-ftrig-listen | 2 | ||||
| -rw-r--r-- | src/pipe-tools/s6-ftrig-listen.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/pipe-tools/deps-exe/s6-ftrig-listen b/src/pipe-tools/deps-exe/s6-ftrig-listen index 0a30526..2d6e6d4 100644 --- a/src/pipe-tools/deps-exe/s6-ftrig-listen +++ b/src/pipe-tools/deps-exe/s6-ftrig-listen @@ -1,5 +1,5 @@ ${LIBS6} --lexecline +${LIBEXECLINE} -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} diff --git a/src/pipe-tools/s6-ftrig-listen.c b/src/pipe-tools/s6-ftrig-listen.c index 993a914..d9c4b53 100644 --- a/src/pipe-tools/s6-ftrig-listen.c +++ b/src/pipe-tools/s6-ftrig-listen.c @@ -4,6 +4,7 @@ #include <errno.h> #include <signal.h> #include <unistd.h> + #include <skalibs/sgetopt.h> #include <skalibs/types.h> #include <skalibs/strerr2.h> @@ -12,7 +13,8 @@ #include <skalibs/djbunix.h> #include <skalibs/sig.h> #include <skalibs/selfpipe.h> -#include <execline/execline.h> + +#include <s6/compat.h> #include <s6/ftrigr.h> #define USAGE "s6-ftrig-listen [ -a | -o ] [ -t timeout ] fifodir1 regexp1 ... \"\" prog..." @@ -56,7 +58,7 @@ int main (int argc, char const **argv, char const *const *envp) argc -= subgetopt_here.ind ; argv += subgetopt_here.ind ; } if (argc < 4) dieusage() ; - argc1 = el_semicolon(argv) ; + argc1 = s6_el_semicolon(argv) ; if (!argc1 || (argc1 & 1) || (argc == argc1 + 1)) dieusage() ; if (argc1 >= argc) strerr_dief1x(100, "unterminated fifodir+regex block") ; tain_now_set_stopwatch_g() ; |