summaryrefslogtreecommitdiff
path: root/src/libenvexec/envalloc_merge.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/envalloc_merge.c
parent265092c55d40f362a521eee97676e0d51ef17800 (diff)
downloadskalibs-18e43565574b700befc832ed4d25d25e40951f68.tar.xz
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/envalloc_merge.c')
-rw-r--r--src/libenvexec/envalloc_merge.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/libenvexec/envalloc_merge.c b/src/libenvexec/envalloc_merge.c
new file mode 100644
index 0000000..84716e4
--- /dev/null
+++ b/src/libenvexec/envalloc_merge.c
@@ -0,0 +1,15 @@
+/* ISC license. */
+
+#include <skalibs/bytestr.h>
+#include <skalibs/env.h>
+#include <skalibs/genalloc.h>
+#include <skalibs/envalloc.h>
+
+int envalloc_merge (genalloc *v, char const *const *envp, size_t envlen, char const *modifs, size_t modiflen)
+{
+ size_t n = envlen + 1 + byte_count(modifs, modiflen, '\0') ;
+ if (!genalloc_readyplus(char const *, v, n)) return 0 ;
+ n = env_mergen(genalloc_s(char const *, v) + genalloc_len(char const *, v), n, envp, envlen, modifs, modiflen, n) ;
+ genalloc_setlen(char const *, v, genalloc_len(char const *, v) + n) ;
+ return 1 ;
+}