summary refs log tree commit diff
path: root/src/libenvexec/env_make.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2020-11-24 21:45:56 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2020-11-24 21:45:56 +0000
commit18e43565574b700befc832ed4d25d25e40951f68 (patch)
tree2c97774819e99132b10dc60403f43e2034e395f9 /src/libenvexec/env_make.c
parent265092c55d40f362a521eee97676e0d51ef17800 (diff)
downloadskalibs-18e43565574b700befc832ed4d25d25e40951f68.tar.gz
skalibs-18e43565574b700befc832ed4d25d25e40951f68.tar.xz
skalibs-18e43565574b700befc832ed4d25d25e40951f68.zip
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
Diffstat (limited to 'src/libenvexec/env_make.c')
-rw-r--r--src/libenvexec/env_make.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/libenvexec/env_make.c b/src/libenvexec/env_make.c
new file mode 100644
index 0000000..60148f8
--- /dev/null
+++ b/src/libenvexec/env_make.c
@@ -0,0 +1,16 @@
+/* ISC license. */
+
+#include <string.h>
+#include <errno.h>
+#include <skalibs/env.h>
+
+int env_make (char const **v, size_t argc, char const *s, size_t len)
+{
+  while (argc--)
+  {
+    size_t n = strlen(s) + 1 ;
+    if (n > len) return (errno = EINVAL, 0) ;
+    *v++ = s ; s += n ; len -= n ;
+  }
+  return 1 ;
+}