commit e63e9a4c5b6cba6a8c2b43a92f0e1a597ed586d2 parent 1c9a61c0697e6af47fa7839226e470ba2c13f919 Author: Laurent Bercot <ska-skaware@skarnet.org> Date: Tue, 29 Nov 2022 12:33:38 +0000 Adapt to skalibs-2.13.0.0 Signed-off-by: Laurent Bercot <ska@appnovation.com> Diffstat:
68 files changed, 83 insertions(+), 71 deletions(-)
diff --git a/INSTALL b/INSTALL @@ -6,11 +6,11 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.12.0.0 or later: https://skarnet.org/software/skalibs/ - - execline version 2.9.0.1 or later: https://skarnet.org/software/execline/ + - skalibs version 2.13.0.0 or later: https://skarnet.org/software/skalibs/ + - execline version 2.9.0.2 or later: https://skarnet.org/software/execline/ (You can disable this requirement at configure time, but will lose some functionality.) - - Optional: nsss version 0.2.0.1 or later: https://skarnet.org/software/nsss/ + - Optional: nsss version 0.2.0.2 or later: https://skarnet.org/software/nsss/ This software will run on any operating system that implements POSIX.1-2008, available at: diff --git a/NEWS b/NEWS @@ -3,6 +3,7 @@ Changelog for s6. In 2.11.2.0 ----------- + - Adaptation to skalibs-2.13.0.0. - Bugfixes. - The name of the service is now passed as an argument to ./run and as the third argument to ./finish. diff --git a/doc/index.html b/doc/index.html @@ -83,12 +83,12 @@ with s6</a> </li> <li> A POSIX-compliant system with a standard C development environment </li> <li> GNU make, version 3.81 or later </li> <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version -2.12.0.0 or later. It's a build-time requirement. It's also a run-time +2.13.0.0 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the skalibs library. </li> <li> (Optional, but really recommended for full functionality): <a href="//skarnet.org/software/execline/">execline</a> version -2.9.0.1 or later. When s6 is built with execline support (which is the default), +2.9.0.2 or later. When s6 is built with execline support (which is the default), execline is a build-time requirement, and also a run-time requirement for certain binaries that spawn scripts interpreted with <a href="//skarnet.org/software/execline/execlineb.html">execlineb</a>. </li> @@ -102,7 +102,7 @@ certain binaries that spawn scripts interpreted with <li> If you're using <a href="https://www.musl-libc.org/">musl</a> and want nsswitch-like functionality: <a href="//skarnet.org/software/nsss/">nsss</a> version -0.2.0.1 or later (build-time and boot-time) </li> +0.2.0.2 or later (build-time and boot-time) </li> </ul> <h3> Licensing </h3> @@ -115,7 +115,7 @@ want nsswitch-like functionality: <h3> Download </h3> <ul> - <li> The current released version of s6 is <a href="s6-2.11.1.2.tar.gz">2.11.1.2</a>. </li> + <li> The current released version of s6 is <a href="s6-2.11.2.0.tar.gz">2.11.2.0</a>. </li> <li> Alternatively, you can checkout a copy of the <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6/">s6 git repository</a>: diff --git a/doc/upgrade.html b/doc/upgrade.html @@ -18,6 +18,17 @@ <h1> What has changed in s6 </h1> +<h2> in 2.11.2.0 </h2> + +<ul> + <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> +dependency bumped to 2.13.0.0. </li> + <li> <a href="//skarnet.org/software/execline/">nsss</a> +optional dependency bumped to 0.2.0.2. </li> + <li> <a href="//skarnet.org/software/execline/">execline</a> +recommended dependency bumped to 2.9.0.2. </li> +</ul> + <h2> in 2.11.1.2 </h2> <ul> diff --git a/src/conn-tools/s6-accessrules-cdb-from-fs.c b/src/conn-tools/s6-accessrules-cdb-from-fs.c @@ -9,7 +9,7 @@ #include <skalibs/posixplz.h> #include <skalibs/types.h> #include <skalibs/cdbmake.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/stralloc.h> #include <skalibs/env.h> #include <skalibs/direntry.h> diff --git a/src/conn-tools/s6-accessrules-fs-from-cdb.c b/src/conn-tools/s6-accessrules-fs-from-cdb.c @@ -9,7 +9,7 @@ #include <skalibs/bytestr.h> #include <skalibs/types.h> #include <skalibs/cdb.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/djbunix.h> #define USAGE "s6-accessrules-fs-from-cdb dir cdbfile" diff --git a/src/conn-tools/s6-connlimit.c b/src/conn-tools/s6-connlimit.c @@ -4,7 +4,7 @@ #include <stdlib.h> #include <skalibs/types.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/exec.h> int main (int argc, char const *const *argv) diff --git a/src/conn-tools/s6-ioconnect.c b/src/conn-tools/s6-ioconnect.c @@ -10,7 +10,7 @@ #include <skalibs/buffer.h> #include <skalibs/sig.h> #include <skalibs/selfpipe.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <skalibs/iopause.h> #include <skalibs/djbunix.h> diff --git a/src/conn-tools/s6-ipcclient.c b/src/conn-tools/s6-ipcclient.c @@ -3,7 +3,7 @@ #include <string.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/djbunix.h> #include <skalibs/socket.h> #include <skalibs/exec.h> diff --git a/src/conn-tools/s6-ipcserver-access.c b/src/conn-tools/s6-ipcserver-access.c @@ -7,7 +7,7 @@ #include <skalibs/gccattributes.h> #include <skalibs/types.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sgetopt.h> #include <skalibs/cdb.h> #include <skalibs/djbunix.h> diff --git a/src/conn-tools/s6-ipcserver-socketbinder.c b/src/conn-tools/s6-ipcserver-socketbinder.c @@ -8,7 +8,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/socket.h> #include <skalibs/exec.h> diff --git a/src/conn-tools/s6-ipcserver.c b/src/conn-tools/s6-ipcserver.c @@ -5,7 +5,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/exec.h> #include <s6/config.h> diff --git a/src/conn-tools/s6-ipcserverd.c b/src/conn-tools/s6-ipcserverd.c @@ -14,7 +14,7 @@ #include <skalibs/gccattributes.h> #include <skalibs/allreadwrite.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/djbunix.h> #include <skalibs/sig.h> #include <skalibs/selfpipe.h> diff --git a/src/conn-tools/s6-sudo.c b/src/conn-tools/s6-sudo.c @@ -2,7 +2,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/exec.h> #include <s6/config.h> diff --git a/src/conn-tools/s6-sudoc.c b/src/conn-tools/s6-sudoc.c @@ -12,7 +12,7 @@ #include <skalibs/sgetopt.h> #include <skalibs/buffer.h> #include <skalibs/stralloc.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/djbunix.h> #include <skalibs/tai.h> #include <skalibs/env.h> diff --git a/src/conn-tools/s6-sudod.c b/src/conn-tools/s6-sudod.c @@ -13,7 +13,7 @@ #include <skalibs/bytestr.h> #include <skalibs/buffer.h> #include <skalibs/stralloc.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <skalibs/iopause.h> #include <skalibs/selfpipe.h> diff --git a/src/daemontools-extras/s6-applyuidgid.c b/src/daemontools-extras/s6-applyuidgid.c @@ -7,7 +7,7 @@ #include <skalibs/types.h> #include <skalibs/setgroups.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sgetopt.h> #include <skalibs/djbunix.h> #include <skalibs/exec.h> diff --git a/src/daemontools-extras/s6-envdir.c b/src/daemontools-extras/s6-envdir.c @@ -3,7 +3,7 @@ #include <errno.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/stralloc.h> #include <skalibs/env.h> #include <skalibs/exec.h> diff --git a/src/daemontools-extras/s6-envuidgid.c b/src/daemontools-extras/s6-envuidgid.c @@ -8,7 +8,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/djbunix.h> #include <skalibs/exec.h> diff --git a/src/daemontools-extras/s6-fghack.c b/src/daemontools-extras/s6-fghack.c @@ -4,7 +4,7 @@ #include <errno.h> #include <sys/wait.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/allreadwrite.h> #include <skalibs/djbunix.h> #include <skalibs/exec.h> diff --git a/src/daemontools-extras/s6-log.c b/src/daemontools-extras/s6-log.c @@ -20,7 +20,7 @@ #include <skalibs/bytestr.h> #include <skalibs/error.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/bufalloc.h> #include <skalibs/stralloc.h> #include <skalibs/tai.h> diff --git a/src/daemontools-extras/s6-setlock.c b/src/daemontools-extras/s6-setlock.c @@ -6,7 +6,7 @@ #include <skalibs/allreadwrite.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/types.h> #include <skalibs/tai.h> #include <skalibs/iopause.h> diff --git a/src/daemontools-extras/s6-setsid.c b/src/daemontools-extras/s6-setsid.c @@ -5,7 +5,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sig.h> #include <skalibs/exec.h> diff --git a/src/daemontools-extras/s6-setuidgid.c b/src/daemontools-extras/s6-setuidgid.c @@ -2,7 +2,7 @@ #include <string.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/exec.h> #include <s6/config.h> diff --git a/src/daemontools-extras/s6-socklog.c b/src/daemontools-extras/s6-socklog.c @@ -13,7 +13,7 @@ #include <skalibs/allreadwrite.h> #include <skalibs/buffer.h> #include <skalibs/error.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <skalibs/iopause.h> #include <skalibs/djbunix.h> diff --git a/src/daemontools-extras/s6-softlimit.c b/src/daemontools-extras/s6-softlimit.c @@ -3,7 +3,7 @@ #include <sys/types.h> #include <sys/resource.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sgetopt.h> #include <skalibs/uint64.h> #include <skalibs/exec.h> diff --git a/src/daemontools-extras/s6-tai64n.c b/src/daemontools-extras/s6-tai64n.c @@ -3,7 +3,7 @@ #include <sys/types.h> #include <errno.h> #include <skalibs/buffer.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <skalibs/stralloc.h> #include <skalibs/skamisc.h> diff --git a/src/daemontools-extras/s6-tai64nlocal.c b/src/daemontools-extras/s6-tai64nlocal.c @@ -3,7 +3,7 @@ #include <sys/types.h> #include <errno.h> #include <skalibs/buffer.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sgetopt.h> #include <skalibs/tai.h> #include <skalibs/djbtime.h> diff --git a/src/daemontools-extras/ucspilogd.c b/src/daemontools-extras/ucspilogd.c @@ -7,7 +7,7 @@ #include <skalibs/sgetopt.h> #include <skalibs/bytestr.h> #include <skalibs/buffer.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/stralloc.h> #include <skalibs/skamisc.h> diff --git a/src/fdholder/s6-fdholder-daemon.c b/src/fdholder/s6-fdholder-daemon.c @@ -5,7 +5,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/exec.h> #include <s6/config.h> diff --git a/src/fdholder/s6-fdholder-delete.c b/src/fdholder/s6-fdholder-delete.c @@ -2,7 +2,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <s6/fdholder.h> diff --git a/src/fdholder/s6-fdholder-getdump.c b/src/fdholder/s6-fdholder-getdump.c @@ -4,7 +4,7 @@ #include <limits.h> #include <skalibs/types.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sgetopt.h> #include <skalibs/tai.h> #include <skalibs/djbunix.h> diff --git a/src/fdholder/s6-fdholder-list.c b/src/fdholder/s6-fdholder-list.c @@ -3,7 +3,7 @@ #include <string.h> #include <skalibs/types.h> #include <skalibs/buffer.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sgetopt.h> #include <skalibs/tai.h> #include <skalibs/stralloc.h> diff --git a/src/fdholder/s6-fdholder-retrieve.c b/src/fdholder/s6-fdholder-retrieve.c @@ -1,7 +1,7 @@ /* ISC license. */ #include <skalibs/types.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sgetopt.h> #include <skalibs/tai.h> #include <skalibs/djbunix.h> diff --git a/src/fdholder/s6-fdholder-setdump.c b/src/fdholder/s6-fdholder-setdump.c @@ -3,7 +3,7 @@ #include <string.h> #include <stdlib.h> #include <skalibs/types.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sgetopt.h> #include <skalibs/tai.h> #include <s6/fdholder.h> diff --git a/src/fdholder/s6-fdholder-store.c b/src/fdholder/s6-fdholder-store.c @@ -1,7 +1,7 @@ /* ISC license. */ #include <skalibs/types.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sgetopt.h> #include <skalibs/tai.h> #include <s6/fdholder.h> diff --git a/src/fdholder/s6-fdholder-transferdump.c b/src/fdholder/s6-fdholder-transferdump.c @@ -1,7 +1,7 @@ /* ISC license. */ #include <skalibs/types.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sgetopt.h> #include <skalibs/tai.h> #include <skalibs/genalloc.h> diff --git a/src/fdholder/s6-fdholderd.c b/src/fdholder/s6-fdholderd.c @@ -18,7 +18,7 @@ #include <skalibs/env.h> #include <skalibs/bytestr.h> #include <skalibs/error.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <skalibs/djbunix.h> #include <skalibs/sig.h> diff --git a/src/libs6/s6-ftrigrd.c b/src/libs6/s6-ftrigrd.c @@ -11,7 +11,7 @@ #include <skalibs/types.h> #include <skalibs/allreadwrite.h> #include <skalibs/error.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/buffer.h> #include <skalibs/stralloc.h> #include <skalibs/sig.h> diff --git a/src/libs6/s6_compat_el_semicolon.c b/src/libs6/s6_compat_el_semicolon.c @@ -7,7 +7,7 @@ #include <stdlib.h> #include <skalibs/types.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> static unsigned int el_getstrict (void) { diff --git a/src/libs6/s6lockd-helper.c b/src/libs6/s6lockd-helper.c @@ -1,7 +1,7 @@ /* ISC license. */ #include <skalibs/allreadwrite.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include "s6lockd.h" diff --git a/src/libs6/s6lockd.c b/src/libs6/s6lockd.c @@ -10,7 +10,7 @@ #include <skalibs/types.h> #include <skalibs/allreadwrite.h> #include <skalibs/error.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/genalloc.h> #include <skalibs/sig.h> #include <skalibs/selfpipe.h> diff --git a/src/libs6/s6lockd_openandlock.c b/src/libs6/s6lockd_openandlock.c @@ -2,7 +2,7 @@ #include <errno.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/djbunix.h> #include "s6lockd.h" diff --git a/src/pipe-tools/s6-cleanfifodir.c b/src/pipe-tools/s6-cleanfifodir.c @@ -1,6 +1,6 @@ /* ISC license. */ -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <s6/ftrigw.h> #define USAGE "s6-cleanfifodir fifodir" diff --git a/src/pipe-tools/s6-ftrig-listen.c b/src/pipe-tools/s6-ftrig-listen.c @@ -7,7 +7,7 @@ #include <skalibs/sgetopt.h> #include <skalibs/types.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <skalibs/iopause.h> #include <skalibs/djbunix.h> diff --git a/src/pipe-tools/s6-ftrig-listen1.c b/src/pipe-tools/s6-ftrig-listen1.c @@ -8,7 +8,7 @@ #include <skalibs/sgetopt.h> #include <skalibs/types.h> #include <skalibs/allreadwrite.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <skalibs/iopause.h> #include <skalibs/djbunix.h> diff --git a/src/pipe-tools/s6-ftrig-notify.c b/src/pipe-tools/s6-ftrig-notify.c @@ -1,6 +1,6 @@ /* ISC license. */ -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <s6/ftrigw.h> #define USAGE "s6-ftrig-notify fifodir message" diff --git a/src/pipe-tools/s6-ftrig-wait.c b/src/pipe-tools/s6-ftrig-wait.c @@ -5,7 +5,7 @@ #include <skalibs/allreadwrite.h> #include <skalibs/sgetopt.h> #include <skalibs/types.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <s6/ftrigr.h> diff --git a/src/pipe-tools/s6-mkfifodir.c b/src/pipe-tools/s6-mkfifodir.c @@ -3,7 +3,7 @@ #include <sys/types.h> #include <skalibs/sgetopt.h> #include <skalibs/types.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <s6/ftrigw.h> #define USAGE "s6-mkfifodir [ -f ] [ -g gid ] fifodir" diff --git a/src/supervision/s6-notifyoncheck.c b/src/supervision/s6-notifyoncheck.c @@ -11,7 +11,7 @@ #include <skalibs/allreadwrite.h> #include <skalibs/bytestr.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <skalibs/djbunix.h> #include <skalibs/selfpipe.h> diff --git a/src/supervision/s6-permafailon.c b/src/supervision/s6-permafailon.c @@ -5,7 +5,7 @@ #include <signal.h> #include <skalibs/types.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/bitarray.h> #include <skalibs/sig.h> #include <skalibs/tai.h> diff --git a/src/supervision/s6-supervise.c b/src/supervision/s6-supervise.c @@ -17,7 +17,7 @@ #include <skalibs/allreadwrite.h> #include <skalibs/bytestr.h> #include <skalibs/types.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <skalibs/iopause.h> #include <skalibs/djbunix.h> diff --git a/src/supervision/s6-svc.c b/src/supervision/s6-svc.c @@ -6,7 +6,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/exec.h> #include <s6/config.h> diff --git a/src/supervision/s6-svdt-clear.c b/src/supervision/s6-svdt-clear.c @@ -1,6 +1,6 @@ /* ISC license. */ -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <s6/supervise.h> #define USAGE "s6-svdt-clear servicedir" diff --git a/src/supervision/s6-svdt.c b/src/supervision/s6-svdt.c @@ -3,7 +3,7 @@ #include <sys/types.h> #include <skalibs/types.h> #include <skalibs/buffer.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sgetopt.h> #include <skalibs/sig.h> #include <s6/supervise.h> diff --git a/src/supervision/s6-svlink.c b/src/supervision/s6-svlink.c @@ -10,7 +10,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> #include <skalibs/tai.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/stralloc.h> #include <skalibs/djbunix.h> diff --git a/src/supervision/s6-svlisten.c b/src/supervision/s6-svlisten.c @@ -6,7 +6,7 @@ #include <skalibs/types.h> #include <skalibs/bitarray.h> #include <skalibs/tai.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/djbunix.h> #include <s6/compat.h> diff --git a/src/supervision/s6-svlisten1.c b/src/supervision/s6-svlisten1.c @@ -5,7 +5,7 @@ #include <skalibs/sgetopt.h> #include <skalibs/types.h> #include <skalibs/tai.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/djbunix.h> #include "s6-svlisten.h" diff --git a/src/supervision/s6-svok.c b/src/supervision/s6-svok.c @@ -1,6 +1,6 @@ /* ISC license. */ -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <s6/supervise.h> #define USAGE "s6-svok servicedir" diff --git a/src/supervision/s6-svperms.c b/src/supervision/s6-svperms.c @@ -10,7 +10,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> #include <skalibs/buffer.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <s6/supervise.h> diff --git a/src/supervision/s6-svscan.c b/src/supervision/s6-svscan.c @@ -12,7 +12,7 @@ #include <skalibs/allreadwrite.h> #include <skalibs/sgetopt.h> #include <skalibs/types.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <skalibs/iopause.h> #include <skalibs/djbunix.h> diff --git a/src/supervision/s6-svscanctl.c b/src/supervision/s6-svscanctl.c @@ -1,7 +1,7 @@ /* ISC license. */ #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <s6/supervise.h> #define USAGE "s6-svscanctl [ -zabhitqnN ] svscandir" diff --git a/src/supervision/s6-svstat.c b/src/supervision/s6-svstat.c @@ -8,7 +8,7 @@ #include <skalibs/types.h> #include <skalibs/bytestr.h> #include <skalibs/buffer.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sgetopt.h> #include <skalibs/sig.h> #include <skalibs/tai.h> diff --git a/src/supervision/s6-svunlink.c b/src/supervision/s6-svunlink.c @@ -5,7 +5,7 @@ #include <skalibs/posixplz.h> #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <s6/supervise.h> diff --git a/src/supervision/s6-svwait.c b/src/supervision/s6-svwait.c @@ -8,7 +8,7 @@ #include <skalibs/bitarray.h> #include <skalibs/sig.h> #include <skalibs/tai.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include "s6-svlisten.h" diff --git a/src/supervision/s6_svlisten_loop.c b/src/supervision/s6_svlisten_loop.c @@ -5,7 +5,7 @@ #include <skalibs/bytestr.h> #include <skalibs/bitarray.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/iopause.h> #include <skalibs/stralloc.h> #include <skalibs/djbunix.h> diff --git a/src/supervision/s6_svlisten_signal_handler.c b/src/supervision/s6_svlisten_signal_handler.c @@ -2,7 +2,7 @@ #include <signal.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sig.h> #include <skalibs/djbunix.h> #include <skalibs/selfpipe.h> diff --git a/src/usertree/s6-usertree-maker.c b/src/usertree/s6-usertree-maker.c @@ -12,7 +12,7 @@ #include <skalibs/bytestr.h> #include <skalibs/buffer.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/stralloc.h> #include <skalibs/djbunix.h> #include <skalibs/skamisc.h>