diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2024-05-04 15:24:40 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2024-05-04 15:24:40 +0000 |
| commit | 6d35cf64e8a40b1d6d5073ba91593078065762ea (patch) | |
| tree | 8ea98e53c4f8e0f010efa583ff903cf7f68ecccd | |
| parent | c684d2df8c04554f79ada0c9bf5aa2e8c01aa82b (diff) | |
| download | skalibs-6d35cf64e8a40b1d6d5073ba91593078065762ea.tar.xz | |
Make env_mergen a symbol again (to avoid ABI breakage)
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rw-r--r-- | package/deps.mak | 1 | ||||
| -rw-r--r-- | src/include/skalibs/env.h | 2 | ||||
| -rw-r--r-- | src/libenvexec/env_mergen.c | 9 |
3 files changed, 11 insertions, 1 deletions
diff --git a/package/deps.mak b/package/deps.mak index 63d42a0..461d97f 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -131,6 +131,7 @@ src/libenvexec/env_len.o src/libenvexec/env_len.lo: src/libenvexec/env_len.c src src/libenvexec/env_make.o src/libenvexec/env_make.lo: src/libenvexec/env_make.c src/include/skalibs/env.h src/libenvexec/env_merg.o src/libenvexec/env_merg.lo: src/libenvexec/env_merg.c src/include/skalibs/env.h src/libenvexec/env_merge.o src/libenvexec/env_merge.lo: src/libenvexec/env_merge.c src/include/skalibs/bytestr.h src/include/skalibs/env.h +src/libenvexec/env_mergen.o src/libenvexec/env_mergen.lo: src/libenvexec/env_mergen.c src/include/skalibs/env.h src/libenvexec/env_mergn.o src/libenvexec/env_mergn.lo: src/libenvexec/env_mergn.c src/include/skalibs/env.h src/libenvexec/env_string.o src/libenvexec/env_string.lo: src/libenvexec/env_string.c src/include/skalibs/env.h src/include/skalibs/stralloc.h src/libenvexec/envalloc_0.o src/libenvexec/envalloc_0.lo: src/libenvexec/envalloc_0.c src/include/skalibs/envalloc.h src/include/skalibs/genalloc.h diff --git a/src/include/skalibs/env.h b/src/include/skalibs/env.h index e5dfd1d..4d6dcc9 100644 --- a/src/include/skalibs/env.h +++ b/src/include/skalibs/env.h @@ -19,7 +19,7 @@ extern int env_string (stralloc *, char const *const *, size_t) ; extern size_t env_merg (char const **, size_t, char const *const *, char const *, size_t) ; extern size_t env_merge (char const **, size_t, char const *const *, size_t, char const *, size_t) ; -#define env_mergen(v, vmax, envp, envlen, modifs, modiflen, modifn) env_merge(v, vmax, envp, envlen, modifs, modiflen) +extern size_t env_mergen (char const **, size_t, char const *const *, size_t, char const *, size_t, size_t) ; extern size_t env_mergn (char const **, size_t, char const *const *, char const *, size_t, size_t) ; #define SKALIBS_ENVDIR_VERBATIM 0x01 diff --git a/src/libenvexec/env_mergen.c b/src/libenvexec/env_mergen.c new file mode 100644 index 0000000..9837536 --- /dev/null +++ b/src/libenvexec/env_mergen.c @@ -0,0 +1,9 @@ +/* ISC license. */ + +#include <skalibs/env.h> + +size_t env_mergen (char const **v, size_t vmax, char const *const *envp, size_t envlen, char const *modifs, size_t modiflen, size_t modifn) +{ + (void)modifn ; + return env_merge(v, vmax, envp, envlen, modifs, modiflen) ; +} |