summaryrefslogtreecommitdiff
path: root/src/libenvexec/envalloc_uniq.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_uniq.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_uniq.c')
-rw-r--r--src/libenvexec/envalloc_uniq.c32
1 files changed, 32 insertions, 0 deletions
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 <string.h>
+#include <errno.h>
+#include <skalibs/bytestr.h>
+#include <skalibs/genalloc.h>
+#include <skalibs/envalloc.h>
+
+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 ;
+}