summaryrefslogtreecommitdiff
path: root/src/libstddjb/env_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/libstddjb/env_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/libstddjb/env_merge.c')
-rw-r--r--src/libstddjb/env_merge.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/src/libstddjb/env_merge.c b/src/libstddjb/env_merge.c
deleted file mode 100644
index 5543e08..0000000
--- a/src/libstddjb/env_merge.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ISC license. */
-
-#include <string.h>
-#include <errno.h>
-#include <skalibs/bytestr.h>
-#include <skalibs/env.h>
-
-size_t env_merge (char const **v, size_t vmax, char const *const *envp, size_t envlen, char const *modifs, size_t modiflen)
-{
- size_t n = byte_count(modifs, modiflen, '\0') ;
- 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 ;
-}