4 files changed, 170 insertions, 21 deletions
diff --git a/src/include/skalibs/djbunix.h b/src/include/skalibs/djbunix.h
index 03cc1af..885a623 100644
--- a/src/include/skalibs/djbunix.h
+++ b/src/include/skalibs/djbunix.h
@@ -6,10 +6,10 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/wait.h>
+
 #include <skalibs/gccattributes.h>
 #include <skalibs/stralloc.h>
-#include <skalibs/envalloc.h>
-#include <skalibs/posixplz.h>
+#include <skalibs/exec.h>  /* compat */
 
 #define DJBUNIX_FLAG_NB  0x01U
 #define DJBUNIX_FLAG_COE 0x02U
@@ -64,24 +64,6 @@ extern int socketpair_internal (int, int, int, unsigned int, int *) ;
 
 extern size_t path_canonicalize (char *, char const *, int) ;
 
-extern int pathexec_env (char const *, char const *) ;
-extern void pathexec_r (char const *const *, char const *const *, size_t, char const *, size_t) ;
-extern void pathexec_r_name (char const *, char const *const *, char const *const *, size_t, char const *, size_t) ;
-extern void pathexec_fromenv (char const *const *, char const *const *, size_t) ;
-extern void pathexec_run (char const *, char const *const *, char const *const *) ;
-extern void pathexec0_run (char const *const *, char const *const *) ;
-extern void pathexec (char const *const *) ;
-extern void pathexec0 (char const *const *) ;
-
-extern void xpathexec_r (char const *const *, char const *const *, size_t, char const *, size_t) gccattr_noreturn ;
-extern void xpathexec_r_name (char const *, char const *const *, char const *const *, size_t, char const *, size_t) gccattr_noreturn ;
-extern void xpathexec_fromenv (char const *const *, char const *const *, size_t) gccattr_noreturn ;
-extern void xexecvep (char const *, char const *const *, char const *const *, char const *) gccattr_noreturn ;
-extern void xpathexec_run (char const *, char const *const *, char const *const *) gccattr_noreturn ;
-extern void xpathexec0_run (char const *const *, char const *const *) gccattr_noreturn ;
-extern void xpathexec (char const *const *) gccattr_noreturn ;
-extern void xpathexec0 (char const *const *) gccattr_noreturn ;
-
 extern pid_t wait_nointr (int *) ;
 extern pid_t waitpid_nointr (pid_t, int *, int) ;
 #define wait_pid(pid, wstat) waitpid_nointr(pid, (wstat), 0)
diff --git a/src/include/skalibs/env.h b/src/include/skalibs/env.h
index bc8177b..73398c2 100644
--- a/src/include/skalibs/env.h
+++ b/src/include/skalibs/env.h
@@ -4,6 +4,7 @@
 #define SKALIBS_ENV_H
 
 #include <sys/types.h>
+
 #include <skalibs/gccattributes.h>
 #include <skalibs/stralloc.h>
 
@@ -11,11 +12,16 @@ extern size_t env_len (char const *const *) gccattr_pure ;
 extern char const *env_get (char const *) gccattr_deprecated ;
 extern char const *env_get2 (char const *const *, char const *) gccattr_pure ;
 extern char const *ucspi_get (char const *) gccattr_pure ;
+
 extern int env_addmodif (stralloc *, char const *, char const *) ;
 extern int env_make (char const **, size_t, char const *, size_t) ;
-extern size_t env_merge (char const **, size_t, char const *const *, size_t, char const *, size_t) ;
 extern int env_string (stralloc *, char const *const *, size_t) ;
 
+extern size_t env_mergen (char const **, size_t, char const *const *, size_t, char const *, size_t, size_t) ;
+extern size_t env_merge (char const **, size_t, char const *const *, size_t, char const *, size_t) ;
+extern size_t env_mergn (char const **, size_t, char const *const *, char const *, size_t, size_t) ;
+extern size_t env_merg (char const **, size_t, char const *const *, char const *, size_t) ;
+
 #define SKALIBS_ENVDIR_VERBATIM 0x01
 #define SKALIBS_ENVDIR_NOCHOMP 0x02
 extern int envdir_internal (char const *, stralloc *, unsigned int, char) ;
diff --git a/src/include/skalibs/exec.h b/src/include/skalibs/exec.h
new file mode 100644
index 0000000..46b4c8a
--- /dev/null
+++ b/src/include/skalibs/exec.h
@@ -0,0 +1,160 @@
+/* ISC license. */
+
+#ifndef SKALIBS_EXEC_H
+#define SKALIBS_EXEC_H
+
+#include <stddef.h>
+
+#include <skalibs/environ.h>
+#include <skalibs/env.h>
+#include <skalibs/gccattributes.h>
+
+
+ /* Without environment modifications */
+
+extern void xexecvep (char const *, char const *const *, char const *const *, char const *) gccattr_noreturn ;
+extern void xexecvep_loose (char const *, char const *const *, char const *const *, char const *) gccattr_noreturn ;
+
+extern void exec_ae (char const *, char const *const *, char const *const *) ;
+#define exec_a(file, argv) exec_ae(file, (argv), (char const *const *)environ)
+#define exec_e(argv, envp) exec_ae((argv)[0], (argv), envp)
+#define exec(argv) exec_a((argv)[0], (argv))
+
+extern void xexec_ae (char const *, char const *const *, char const *const *) gccattr_noreturn ;
+#define xexec_a(file, argv) xexec_ae(file, (argv), (char const *const *)environ)
+#define xexec_e(argv, envp) xexec_ae((argv)[0], (argv), envp)
+#define xexec(argv) xexec_a((argv)[0], (argv))
+
+extern void exec0_ae (char const *, char const *const *, char const *const *) ;
+#define exec0_a(file, argv) exec0_ae(file, (argv), (char const *const *)environ)
+#define exec0_e(argv, envp) exec0_ae((argv)[0], (argv), envp)
+#define exec0(argv) exec0_a((argv)[0], (argv))
+
+extern void xexec0_ae (char const *, char const *const *, char const *const *) gccattr_noreturn ;
+#define xexec0_a(file, argv) xexec0_ae(file, (argv), (char const *const *)environ)
+#define xexec0_e(argv, envp) xexec0_ae((argv)[0], (argv), envp)
+#define xexec0(argv) xexec0_a((argv)[0], (argv))
+
+
+ /* With environment modifications : env_merge and exec */
+
+extern int env_mexec (char const *, char const *) ;
+
+extern void mexec_afn (char const *, char const *const *, char const *const *, size_t, char const *, size_t, size_t) ;
+extern void mexec_afm (char const *, char const *const *, char const *const *, size_t, char const *, size_t) ;
+extern void mexec_af (char const *, char const *const *, char const *const *, size_t) ;
+
+#define mexec_aen(file, argv, envp, modif, modiflen, modifn) mexec_afn(file, argv, envp, env_len(envp), modif, modiflen, modifn)
+#define mexec_aem(file, argv, envp, modif, modiflen) mexec_afm(file, argv, envp, env_len(envp), modif, modiflen)
+#define mexec_ae(file, argv, envp) mexec_af(file, argv, envp, env_len(envp))
+
+#define mexec_an(file, argv, modif, modiflen, modifn) mexec_aen(file, argv, (char const *const *)environ, modif, modiflen, modifn)
+#define mexec_am(file, argv, modif, modiflen) mexec_aem(file, argv, (char const *const *)environ, modif, modiflen)
+#define mexec_a(file, argv) mexec_ae(file, argv, (char const *const *)environ)
+
+#define mexec_fn(argv, envp, envlen, modif, modiflen, modifn) mexec_afn((argv)[0], (argv), envp, envlen, modif, modiflen, modifn)
+#define mexec_fm(argv, envp, envlen, modif, modiflen) mexec_afm((argv)[0], (argv), envp, envlen, modif, modiflen)
+#define mexec_f(argv, envp, envlen) mexec_af((argv)[0], (argv), envp, envlen)
+
+#define mexec_en(argv, envp, modif, modiflen, modifn) mexec_aen((argv)[0], (argv), envp, modif, modiflen, modifn)
+#define mexec_em(argv, envp, modif, modiflen) mexec_aem((argv)[0], (argv), envp, modif, modiflen)
+#define mexec_e(argv, envp) mexec_a((argv)[0], (argv), envp)
+
+#define mexec_n(argv, modif, modiflen, modifn) mexec_an((argv)[0], (argv), modif, modiflen, modifn)
+#define mexec_m(argv, modif, modiflen) mexec_am((argv)[0], (argv), modif, modiflen)
+#define mexec(argv) mexec_a((argv)[0], (argv))
+
+extern void mexec0_afn (char const *, char const *const *, char const *const *, size_t, char const *, size_t, size_t) ;
+extern void mexec0_afm (char const *, char const *const *, char const *const *, size_t, char const *, size_t) ;
+extern void mexec0_af (char const *, char const *const *, char const *const *, size_t) ;
+
+#define mexec0_aen(file, argv, envp, modif, modiflen, modifn) mexec0_afn(file, argv, envp, env_len(envp), modif, modiflen, modifn)
+#define mexec0_aem(file, argv, envp, modif, modiflen) mexec0_afm(file, argv, envp, env_len(envp), modif, modiflen)
+#define mexec0_ae(file, argv, envp) mexec0_af(file, argv, envp, env_len(envp))
+
+#define mexec0_an(file, argv, modif, modiflen, modifn) mexec0_aen(file, argv, (char const *const *)environ, modif, modiflen, modifn)
+#define mexec0_am(file, argv, modif, modiflen) mexec0_aem(file, argv, (char const *const *)environ, modif, modiflen)
+#define mexec0_a(file, argv) mexec0_ae(file, argv, (char const *const *)environ)
+
+#define mexec0_fn(argv, envp, envlen, modif, modiflen, modifn) mexec0_afn((argv)[0], (argv), envp, envlen, modif, modiflen, modifn)
+#define mexec0_fm(argv, envp, envlen, modif, modiflen) mexec0_afm((argv)[0], (argv), envp, envlen, modif, modiflen)
+#define mexec0_f(argv, envp, envlen) mexec0_af((argv)[0], (argv), envp, envlen)
+
+#define mexec0_en(argv, envp, modif, modiflen, modifn) mexec0_aen((argv)[0], (argv), envp, modif, modiflen, modifn)
+#define mexec0_em(argv, envp, modif, modiflen) mexec0_aem((argv)[0], (argv), envp, modif, modiflen)
+#define mexec0_e(argv, envp) mexec0_a((argv)[0], (argv), envp)
+
+#define mexec0_n(argv, modif, modiflen, modifn) mexec0_an((argv)[0], (argv), modif, modiflen, modifn)
+#define mexec0_m(argv, modif, modiflen) mexec0_am((argv)[0], (argv), modif, modiflen)
+#define mexec0(argv) mexec0_a((argv)[0], (argv))
+
+extern void xmexec_afn (char const *, char const *const *, char const *const *, size_t, char const *, size_t, size_t) gccattr_noreturn ;
+extern void xmexec_afm (char const *, char const *const *, char const *const *, size_t, char const *, size_t) gccattr_noreturn ;
+extern void xmexec_af (char const *, char const *const *, char const *const *, size_t) gccattr_noreturn ;
+
+#define xmexec_aen(file, argv, envp, modif, modiflen, modifn) xmexec_afn(file, argv, envp, env_len(envp), modif, modiflen, modifn)
+#define xmexec_aem(file, argv, envp, modif, modiflen) xmexec_afm(file, argv, envp, env_len(envp), modif, modiflen)
+#define xmexec_ae(file, argv, envp) xmexec_af(file, argv, envp, env_len(envp))
+
+#define xmexec_an(file, argv, modif, modiflen, modifn) xmexec_aen(file, argv, (char const *const *)environ, modif, modiflen, modifn)
+#define xmexec_am(file, argv, modif, modiflen) xmexec_aem(file, argv, (char const *const *)environ, modif, modiflen)
+#define xmexec_a(file, argv) xmexec_ae(file, argv, (char const *const *)environ)
+
+#define xmexec_fn(argv, envp, envlen, modif, modiflen, modifn) xmexec_afn((argv)[0], (argv), envp, envlen, modif, modiflen, modifn)
+#define xmexec_fm(argv, envp, envlen, modif, modiflen) xmexec_afm((argv)[0], (argv), envp, envlen, modif, modiflen)
+#define xmexec_f(argv, envp, envlen) xmexec_af((argv)[0], (argv), envp, envlen)
+
+#define xmexec_en(argv, envp, modif, modiflen, modifn) xmexec_aen((argv)[0], (argv), envp, modif, modiflen, modifn)
+#define xmexec_em(argv, envp, modif, modiflen) xmexec_aem((argv)[0], (argv), envp, modif, modiflen)
+#define xmexec_e(argv, envp) xmexec_a((argv)[0], (argv), envp)
+
+#define xmexec_n(argv, modif, modiflen, modifn) xmexec_an((argv)[0], (argv), modif, modiflen, modifn)
+#define xmexec_m(argv, modif, modiflen) xmexec_am((argv)[0], (argv), modif, modiflen)
+#define xmexec(argv) xmexec_a((argv)[0], (argv))
+
+extern void xmexec0_afn (char const *, char const *const *, char const *const *, size_t, char const *, size_t, size_t) ;
+extern void xmexec0_afm (char const *, char const *const *, char const *const *, size_t, char const *, size_t) ;
+extern void xmexec0_af (char const *, char const *const *, char const *const *, size_t) ;
+
+#define xmexec0_aen(file, argv, envp, modif, modiflen, modifn) xmexec0_afn(file, argv, envp, env_len(envp), modif, modiflen, modifn)
+#define xmexec0_aem(file, argv, envp, modif, modiflen) xmexec0_afm(file, argv, envp, env_len(envp), modif, modiflen)
+#define xmexec0_ae(file, argv, envp) xmexec0_af(file, argv, envp, env_len(envp))
+
+#define xmexec0_an(file, argv, modif, modiflen, modifn) xmexec0_aen(file, argv, (char const *const *)environ, modif, modiflen, modifn)
+#define xmexec0_am(file, argv, modif, modiflen) xmexec0_aem(file, argv, (char const *const *)environ, modif, modiflen)
+#define xmexec0_a(file, argv) xmexec0_ae(file, argv, (char const *const *)environ)
+
+#define xmexec0_fn(argv, envp, envlen, modif, modiflen, modifn) xmexec0_afn((argv)[0], (argv), envp, envlen, modif, modiflen, modifn)
+#define xmexec0_fm(argv, envp, envlen, modif, modiflen) xmexec0_afm((argv)[0], (argv), envp, envlen, modif, modiflen)
+#define xmexec0_f(argv, envp, envlen) xmexec0_af((argv)[0], (argv), envp, envlen)
+
+#define xmexec0_en(argv, envp, modif, modiflen, modifn) xmexec0_aen((argv)[0], (argv), envp, modif, modiflen, modifn)
+#define xmexec0_em(argv, envp, modif, modiflen) xmexec0_aem((argv)[0], (argv), envp, modif, modiflen)
+#define xmexec0_e(argv, envp) xmexec0_a((argv)[0], (argv), envp)
+
+#define xmexec0_n(argv, modif, modiflen, modifn) xmexec0_an((argv)[0], (argv), modif, modiflen, modifn)
+#define xmexec0_m(argv, modif, modiflen) xmexec0_am((argv)[0], (argv), modif, modiflen)
+#define xmexec0(argv) xmexec0_a((argv)[0], (argv))
+
+
+ /* Compatibility */
+
+#define pathexec_run(file, argv, envp) exec_ae(file, argv, envp)
+#define pathexec0_run(file, argv, envp) exec0_ae(file, argv, envp)
+#define xpathexec_run(file, argv, envp) xexec_ae(file, argv, envp)
+#define xpathexec0_run(file, argv, envp) xexec0_ae(file, argv, envp)
+
+#define pathexec_env(key, value) env_mexec(key, value)
+#define pathexec_fromenv(argv, envp, envlen) mexec_f(argv, envp, envlen)
+#define pathexec(argv) mexec(argv)
+#define pathexec0(argv) mexec0(argv)
+#define xpathexec_fromenv(argv, envp, envlen) xmexec_f(argv, envp, envlen)
+#define xpathexec(argv) xmexec(argv)
+#define xpathexec0(argv) xmexec0(argv)
+
+#define pathexec_r_name(file, argv, envp, envlen, modif, modiflen) mexec_afm(file, argv, envp, envlen, modif, modiflen)
+#define pathexec_r(argv, envp, envlen, modif, modiflen) mexec_fm(argv, envp, envlen, modif, modiflen)
+#define xpathexec_r_name(file, argv, envp, envlen, modif, modiflen) xmexec_afm(file, argv, envp, envlen, modif, modiflen)
+#define xpathexec_r(argv, envp, envlen, modif, modiflen) xmexec_fm(argv, envp, envlen, modif, modiflen)
+
+#endif
diff --git a/src/include/skalibs/stddjb.h b/src/include/skalibs/stddjb.h
index 232b5f3..071c913 100644
--- a/src/include/skalibs/stddjb.h
+++ b/src/include/skalibs/stddjb.h
@@ -28,6 +28,7 @@
 #include <skalibs/djbunix.h>
 #include <skalibs/envalloc.h>
 #include <skalibs/env.h>
+#include <skalibs/exec.h>
 #include <skalibs/fmtscan.h>
 #include <skalibs/functypes.h>
 #include <skalibs/gccattributes.h>