s6

commit 977d6ca915355954ae6215b0aa577c24fc257efe
parent ddc76841398dfd5e18b22943727ad74b880236d3
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Wed, 21 Dec 2022 13:32:36 +0000

 Update execline dep; s6-envdir QoL

Signed-off-by: Laurent Bercot <ska@appnovation.com>

Diffstat:
M
INSTALL
 | 
2
+-
M
doc/index.html
 | 
2
+-
M
doc/upgrade.html
 | 
2
+-
M
src/daemontools-extras/s6-envdir.c
 | 
2
+-

4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/INSTALL b/INSTALL
@@ -7,7 +7,7 @@ Build Instructions
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
   - 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/
+  - execline version 2.9.1.0 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.2 or later: https://skarnet.org/software/nsss/
diff --git a/doc/index.html b/doc/index.html
@@ -88,7 +88,7 @@ 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.2 or later. When s6 is built with execline support (which is the default),
+2.9.1.0 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>
diff --git a/doc/upgrade.html b/doc/upgrade.html
@@ -26,7 +26,7 @@ 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>
+recommended dependency bumped to 2.9.1.0. </li>
 </ul>
 
 <h2> in 2.11.1.2 </h2>
diff --git a/src/daemontools-extras/s6-envdir.c b/src/daemontools-extras/s6-envdir.c
@@ -36,6 +36,6 @@ int main (int argc, char const *const *argv)
   argc -= l.ind ; argv += l.ind ;
   if (argc < 2) strerr_dieusage(100, USAGE) ;
   if ((envdir_internal(*argv++, &modifs, options, nullis) < 0) && (insist || (errno != ENOENT)))
-    strerr_diefu1sys(111, "envdir") ;
+    strerr_diefu2sys(111, "envdir ", argv[-1]) ;
   xmexec_m(argv, modifs.s, modifs.len) ;
 }