Complete revamp of the pathexec functions

- pathexec_run is now called exec_ae
    a for provided file name (default: argv[0])
    e for provided envp (default: environ)
- pathexec is now called mexec. m for merge environment. Option letters are:
    a for provided file name (default: argv[0])
    e for provided envp (default: environ)
    f for provided envp *and* length of the envp
    m for provided modif string plus its length (the length is always needed
because the modifs are null-terminated)
    n for provided modif string, length *and* number of modifs
- functions have a foo0 version for _exit(0) when argv[0] is null
- functions have a xfoo version to die if the exec fails
- and a xfoo0
- Compatibility #defines and #includes are there until the next major bump

1 files changed, 26 insertions, 0 deletions

diff --git a/src/libenvexec/env_mergen.c b/src/libenvexec/env_mergen.c
new file mode 100644
index 0000000..acc7c39
--- /dev/null
+++ b/src/libenvexec/env_mergen.c
@@ -0,0 +1,26 @@
+/* ISC license. */
+
+#include <string.h>
+#include <errno.h>
+
+#include <skalibs/bytestr.h>
+#include <skalibs/env.h>
+
+size_t env_mergen (char const **v, size_t vmax, char const *const *envp, size_t envlen, char const *modifs, size_t modiflen, size_t n)
+{
+  size_t vlen = envlen ;
+  size_t i = 0 ;
+  if (envlen + n + 1 > vmax) return (errno = ENAMETOOLONG, 0) ;
+  for (; i < envlen ; i++) v[i] = envp[i] ;
+  for (i = 0 ; i < modiflen ; i += strlen(modifs + i) + 1)
+  {
+    size_t split = str_chr(modifs + i, '=') ;
+    size_t j = 0 ;
+    for (; j < vlen ; j++)
+      if (!strncmp(modifs + i, v[j], split) && (v[j][split] == '=')) break ;
+    if (j < vlen) v[j] = v[--vlen] ;
+    if (modifs[i + split]) v[vlen++] = modifs + i ;
+  }
+  v[vlen++] = 0 ;
+  return vlen ;
+}