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/envalloc_uniq.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/libenvexec/envalloc_uniq.c (limited to 'src/libenvexec/envalloc_uniq.c') diff --git a/src/libenvexec/envalloc_uniq.c b/src/libenvexec/envalloc_uniq.c new file mode 100644 index 0000000..cf60b44 --- /dev/null +++ b/src/libenvexec/envalloc_uniq.c @@ -0,0 +1,32 @@ +/* ISC license. */ + +#include +#include +#include +#include +#include + +int envalloc_uniq (genalloc *v, char delim) +{ + unsigned int m = 0 ; + size_t i = 0 ; + for (; i < genalloc_len(char const *, v) ; i++) + { + size_t j = i+1 ; + char const *s = genalloc_s(char const *, v)[i] ; + size_t n = str_chr(s, delim) ; + if (delim && !s[n]) return (errno = EINVAL, -1) ; + for (; j < genalloc_len(char const *, v) ; j++) + { + char const **p = genalloc_s(char const *, v) ; + if (!strncmp(s, p[j], n)) + { + size_t len = genalloc_len(char const *, v) - 1 ; + genalloc_setlen(char const *, v, len) ; + p[j] = p[len] ; + m++ ; + } + } + } + return m ; +} -- cgit v1.3.1