From ed9842b88802bf75b7e194434438df2ecb88d3aa Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 30 Nov 2020 11:50:25 +0000
Subject:  Fix build with skalibs-2.10.0.0

---
 src/execline/background.c | 4 ++--
 src/execline/ifthenelse.c | 1 +
 src/execline/redirfd.c    | 1 +
 src/execline/runblock.c   | 2 +-
 src/execline/shift.c      | 2 +-
 src/posix/posix-cd.c      | 4 +++-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/execline/background.c b/src/execline/background.c
index 8a301a4..b2ebc76 100644
--- a/src/execline/background.c
+++ b/src/execline/background.c
@@ -1,10 +1,10 @@
 /* ISC license. */
 
+#include <skalibs/posixplz.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/strerr2.h>
-#include <skalibs/env.h>
-#include <skalibs/djbunix.h>
+#include <skalibs/exec.h>
 
 #include <execline/execline.h>
 
diff --git a/src/execline/ifthenelse.c b/src/execline/ifthenelse.c
index 332bc4c..932aed3 100644
--- a/src/execline/ifthenelse.c
+++ b/src/execline/ifthenelse.c
@@ -6,6 +6,7 @@
 #include <skalibs/types.h>
 #include <skalibs/strerr2.h>
 #include <skalibs/djbunix.h>
+#include <skalibs/exec.h>
 
 #include <execline/execline.h>
 
diff --git a/src/execline/redirfd.c b/src/execline/redirfd.c
index 6801239..d445b1a 100644
--- a/src/execline/redirfd.c
+++ b/src/execline/redirfd.c
@@ -7,6 +7,7 @@
 #include <skalibs/types.h>
 #include <skalibs/strerr2.h>
 #include <skalibs/djbunix.h>
+#include <skalibs/exec.h>
 
 #define USAGE "redirfd -[ r | w | u | a | x ] [ -n ] [ -b ] fd file prog..."
 #define dieusage() strerr_dieusage(100, USAGE)
diff --git a/src/execline/runblock.c b/src/execline/runblock.c
index 6414415..233e2f3 100644
--- a/src/execline/runblock.c
+++ b/src/execline/runblock.c
@@ -8,8 +8,8 @@
 #include <skalibs/env.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
-#include <skalibs/djbunix.h>
 #include <skalibs/skamisc.h>
+#include <skalibs/exec.h>
 
 #include <execline/execline.h>
 
diff --git a/src/execline/shift.c b/src/execline/shift.c
index 7c36f5b..7f2d146 100644
--- a/src/execline/shift.c
+++ b/src/execline/shift.c
@@ -116,7 +116,7 @@ int main (int argc, char const *const *argv)
       fmt[uint_fmt(fmt, i)] = 0 ;
       fmu[uint_fmt(fmu, i + n)] = 0 ;
       if (!env_mexec(fmt, i <= (sharp - n) ? getenv(fmu) : 0))
-        strerr_diefu1sys(111, "pathexec_env") ;
+        strerr_diefu1sys(111, "modify environment") ;
     }
   }
   xmexec(argv) ;
diff --git a/src/posix/posix-cd.c b/src/posix/posix-cd.c
index cbeea5b..ee0b338 100644
--- a/src/posix/posix-cd.c
+++ b/src/posix/posix-cd.c
@@ -13,12 +13,14 @@
 #include <skalibs/strerr2.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
+#include <skalibs/env.h>
+#include <skalibs/exec.h>
 
 #define USAGE "posix-cd [ -L | -P ] [ - | path ] [ prog... ]"
 #define dieusage() strerr_dieusage(100, USAGE)
 #define dienomem() strerr_diefu1sys(111, "stralloc_catb")
 
-int main (int argc, char const **argv, char const *const *envp)
+int main (int argc, char const **argv)
 {
   int phy = 0 ;
   int dopwd = 0 ;
-- 
cgit v1.2.3