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/libenvexec/env_merge.c | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/libenvexec/env_merge.c (limited to 'src/libenvexec/env_merge.c') diff --git a/src/libenvexec/env_merge.c b/src/libenvexec/env_merge.c new file mode 100644 index 0000000..ac3e17c --- /dev/null +++ b/src/libenvexec/env_merge.c @@ -0,0 +1,9 @@ +/* ISC license. */ + +#include +#include + +size_t env_merge (char const **v, size_t vmax, char const *const *envp, size_t envlen, char const *modifs, size_t modiflen) +{ + return env_mergen(v, vmax, envp, envlen, modifs, modiflen, byte_count(modifs, modiflen, '\0')) ; +} -- cgit v1.2.3