From 438ec28cb8b88f392ca7b0c13447bd021810a564 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 30 Nov 2020 12:28:04 +0000
Subject:  Prepare for 2.2.3.1, adapt to skalibs-2.10.0.0

---
 INSTALL                        |  2 +-
 NEWS                           |  5 +++++
 doc/index.html                 |  4 ++--
 doc/upgrade.html               |  7 +++++++
 package/info                   |  2 +-
 src/skaembutils/s6-env.c       |  6 ++++--
 src/skaembutils/s6-nice.c      |  7 ++++---
 src/skaembutils/s6-sleep.c     |  6 +++---
 src/skaembutils/s6-touch.c     |  2 +-
 src/skaembutils/seekablepipe.c | 14 ++++++++------
 10 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/INSTALL b/INSTALL
index 5271995..377935a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.9.3.0 or later: http://skarnet.org/software/skalibs/
+  - skalibs version 2.10.0.0 or later: http://skarnet.org/software/skalibs/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
diff --git a/NEWS b/NEWS
index e5ed5c9..3e3c124 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 Changelog for s6-portable-utils.
 
+In 2.2.3.1
+----------
+
+ - Build with skalibs-2.10.0.0.
+
 In 2.2.3.0
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 45c68fe..169df0e 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -61,7 +61,7 @@ the package is now used to host specific utilities such as
  <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.9.3.0 or later. It's a build-time requirement. It's also a run-time
+2.10.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>
 </ul>
@@ -77,7 +77,7 @@ library. </li>
 
 <ul>
  <li> The current released version of s6-portable-utils is
-<a href="s6-portable-utils-2.2.3.0.tar.gz">2.2.3.0</a>. </li>
+<a href="s6-portable-utils-2.2.3.1.tar.gz">2.2.3.1</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-portable-utils/">s6-portable-utils
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 87fed91..8755bf0 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in s6-portable-utils </h1>
 
+<h2> in 2.2.3.1 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.10.0.0. </li>
+</ul>
+
 <h2> in 2.2.3.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 07da201..99d1f6a 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-portable-utils
-version=2.2.3.0
+version=2.2.3.1
 category=admin
 package_macro_name=S6_PORTABLE_UTILS
diff --git a/src/skaembutils/s6-env.c b/src/skaembutils/s6-env.c
index ce91b94..6c039ba 100644
--- a/src/skaembutils/s6-env.c
+++ b/src/skaembutils/s6-env.c
@@ -2,10 +2,12 @@
 
 #include <string.h>
 #include <errno.h>
+
 #include <skalibs/sgetopt.h>
 #include <skalibs/strerr2.h>
 #include <skalibs/env.h>
-#include <skalibs/djbunix.h>
+#include <skalibs/exec.h>
+
 #include <s6-portable-utils/config.h>
 
 #define USAGE "s6-env [ -i ] [ name=value... ] prog..."
@@ -37,5 +39,5 @@ int main (int argc, char const *const *argv, char const *const *envp)
       strerr_diefu1sys(111, "stralloc_cats") ;
   }
   if (!argc) argv = arg_zero ;
-  xpathexec_r(argv, envp, env_len(envp), modifs.s, modifs.len) ;
+  xmexec_em(argv, envp, modifs.s, modifs.len) ;
 }
diff --git a/src/skaembutils/s6-nice.c b/src/skaembutils/s6-nice.c
index 3347d54..256f5e2 100644
--- a/src/skaembutils/s6-nice.c
+++ b/src/skaembutils/s6-nice.c
@@ -2,14 +2,15 @@
 
 #include <unistd.h>
 #include <errno.h>
+
 #include <skalibs/sgetopt.h>
 #include <skalibs/types.h>
 #include <skalibs/strerr2.h>
-#include <skalibs/djbunix.h>
+#include <skalibs/exec.h>
 
 #define USAGE "s6-nice [ -I | -i ] [ -n value ] prog..."
 
-int main (int argc, char const *const *argv, char const *const *envp)
+int main (int argc, char const *const *argv)
 {
   int incr = 10 ;
   int strict = 0 ;
@@ -40,5 +41,5 @@ int main (int argc, char const *const *argv, char const *const *envp)
     if (strict) strerr_diefu2sys(111, "nice to ", fmt) ;
     else strerr_warnwu2sys("nice to ", fmt) ;
   }
-  xpathexec_run(argv[0], argv, envp) ;
+  xexec(argv) ;
 }
diff --git a/src/skaembutils/s6-sleep.c b/src/skaembutils/s6-sleep.c
index 27da2b2..83d8c3d 100644
--- a/src/skaembutils/s6-sleep.c
+++ b/src/skaembutils/s6-sleep.c
@@ -4,12 +4,12 @@
 #include <skalibs/strerr2.h>
 #include <skalibs/types.h>
 #include <skalibs/tai.h>
-#include <skalibs/djbunix.h>
 #include <skalibs/iopause.h>
+#include <skalibs/exec.h>
 
 #define USAGE "s6-sleep [ -m ] duration prog..."
 
-int main (int argc, char const *const *argv, char const *const *envp)
+int main (int argc, char const *const *argv)
 {
   unsigned int n ;
   int milli = 0 ;
@@ -40,5 +40,5 @@ int main (int argc, char const *const *argv, char const *const *envp)
     deepsleepuntil_g(&deadline) ;
   }
 
-  xpathexec0_run(argv+1, envp) ;
+  xexec0(argv+1) ;
 }
diff --git a/src/skaembutils/s6-touch.c b/src/skaembutils/s6-touch.c
index 5b90987..6aefc43 100644
--- a/src/skaembutils/s6-touch.c
+++ b/src/skaembutils/s6-touch.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
+#include <skalibs/posixplz.h>
 #include <skalibs/strerr2.h>
-#include <skalibs/djbunix.h>
 
 #define USAGE "s6-touch file ..."
 
diff --git a/src/skaembutils/seekablepipe.c b/src/skaembutils/seekablepipe.c
index 419be78..c2f5f48 100644
--- a/src/skaembutils/seekablepipe.c
+++ b/src/skaembutils/seekablepipe.c
@@ -1,15 +1,18 @@
 /* ISC license. */
 
 #include <unistd.h>
+
+#include <skalibs/posixplz.h>
 #include <skalibs/strerr2.h>
 #include <skalibs/iobuffer.h>
 #include <skalibs/djbunix.h>
+#include <skalibs/exec.h>
 
 #define USAGE "seekablepipe tempfile prog..."
 
 #define N 8192
 
-int main (int argc, char const *const *argv, char const *const *envp)
+int main (int argc, char const *const *argv)
 {
   iobuffer b ;
   int fdr, fdw ;
@@ -22,8 +25,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
   fdr = open_readb(argv[1]) ;
   if (fdr < 0)
     strerr_diefu3sys(111, "open ", argv[1], " for reading") ;
-  if (unlink(argv[1]) < 0)
-    strerr_diefu2sys(111, "unlink ", argv[1]) ;
+  unlink_void(argv[1]) ;
   if (ndelay_off(fdw) < 0)
     strerr_diefu1sys(111, "set fdw blocking") ;
   if (!iobuffer_init(&b, 0, fdw))
@@ -33,8 +35,8 @@ int main (int argc, char const *const *argv, char const *const *envp)
       strerr_diefu2sys(111, "write to ", argv[1]) ;
   if (r < 0) strerr_diefu1sys(111, "read from stdin") ;
   iobuffer_finish(&b) ;
-  fd_close(fdw) ;
+  close(fdw) ;
   if (fd_move(0, fdr) < 0)
-    strerr_diefu1sys(111, "move fdr to stdin") ;
-  xpathexec_run(argv[2], argv+2, envp) ;
+    strerr_diefu1sys(111, "move temporary file descriptor") ;
+  xexec(argv+2) ;
 }
-- 
cgit 1.4.1