diff options
68 files changed, 83 insertions, 71 deletions
diff --git a/INSTALL b/INSTALL index 3271cd6..51ce682 100644 --- 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 index ea00bb2..fe1418e 100644 --- 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 index 7247511..1210f03 100644 --- 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 index dabe6ed..dcf6f7a 100644 --- 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 index 1b0b233..2147396 100644 --- 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 index ce1ff9c..af41f47 100644 --- 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 index 959c421..e613582 100644 --- 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 index 8e19c36..c86ec55 100644 --- 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 index df21a2f..05738c7 100644 --- 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 index 7efb215..5d8d44d 100644 --- 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 index 28c5506..7ddc69a 100644 --- 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 index ff28501..7b4bd11 100644 --- 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 index 3ef4ded..3de8fae 100644 --- 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 index 96d0ea0..56d7dcc 100644 --- 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 index 6d923df..76adead 100644 --- 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 index 6bf403c..060628d 100644 --- 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 index a064aa3..d206b90 100644 --- 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 index 9b98b4a..6c55d12 100644 --- 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 index 46d4607..a7b0292 100644 --- 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 index a2f1f2b..c90792a 100644 --- 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 index 5a7ce4d..bc964e9 100644 --- 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 index 96697e4..8eeb95b 100644 --- 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 index 53c3488..6fd42dd 100644 --- 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 index f6103c1..26256b8 100644 --- 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 index 8781a56..ec3de8f 100644 --- 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 index 8ec4470..f9db3a6 100644 --- 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 index c6b2859..e10e58a 100644 --- 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 index 75dd5a3..80e9480 100644 --- 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 index 0ab6013..c9f377b 100644 --- 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 index efb84ab..9508c2c 100644 --- 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 index ac0c9e7..3778784 100644 --- 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 index 69781c3..5ab7b2c 100644 --- 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 index 4f16af3..257f206 100644 --- 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 index 0e8d224..0c07d8a 100644 --- 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 index 1d36aba..21c26cf 100644 --- 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 index ff53034..f27d028 100644 --- 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 index 3fa4790..8a85482 100644 --- 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 index 483c20a..073f7bf 100644 --- 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 index 00e7703..3ebbe1e 100644 --- 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 index d6fdd06..fe4787e 100644 --- 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 index 8dbf255..7bfcf38 100644 --- 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 index 285fb47..04861ba 100644 --- 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 index 42c3ca6..ca51934 100644 --- 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 index 4af38e1..3c1efb6 100644 --- 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 index bd4a280..92e257e 100644 --- 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 index 80db9b1..b81b484 100644 --- 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 index e4f07db..1dbd67a 100644 --- 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 index 6cf0b25..d0e3a1a 100644 --- 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 index 3a188d5..12958f9 100644 --- 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 index 1be61d2..592502c 100644 --- 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 index d34d09b..37794c2 100644 --- 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 index 42372cd..7036a6d 100644 --- 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 index 5467ea2..012bfaa 100644 --- 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 index 6b36718..3591752 100644 --- 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 index 3df356a..bb095ef 100644 --- 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 index 4f36f3d..72f1a17 100644 --- 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 index 5b9329d..55aa993 100644 --- 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 index 7ba6eac..022d9e8 100644 --- 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 index c6c6bd4..1dbfaf0 100644 --- 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 index 4b8de05..0d78c46 100644 --- 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 index 0c0e665..4334e64 100644 --- 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 index 119d41e..ad0a60e 100644 --- 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 index 979552f..f683ef8 100644 --- 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 index 0542926..1441ed5 100644 --- 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 index 35788b6..3633bd1 100644 --- 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 index 3a89a9c..6043603 100644 --- 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 index b846c05..723771f 100644 --- 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 index 9f65b77..3edbd8b 100644 --- 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> |