From 18e43565574b700befc832ed4d25d25e40951f68 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 24 Nov 2020 21:45:56 +0000 Subject: 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 --- src/libstddjb/envalloc_merge.c | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 src/libstddjb/envalloc_merge.c (limited to 'src/libstddjb/envalloc_merge.c') diff --git a/src/libstddjb/envalloc_merge.c b/src/libstddjb/envalloc_merge.c deleted file mode 100644 index 2747f50..0000000 --- a/src/libstddjb/envalloc_merge.c +++ /dev/null @@ -1,15 +0,0 @@ -/* ISC license. */ - -#include -#include -#include -#include - -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_merge(genalloc_s(char const *, v) + genalloc_len(char const *, v), n, envp, envlen, modifs, modiflen) ; - genalloc_setlen(char const *, v, genalloc_len(char const *, v) + n) ; - return 1 ; -} -- cgit v1.2.3