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 /src | |
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/include/skalibs/env.h | 2 | ||||
-rw-r--r-- | src/libenvexec/env_mergen.c | 9 |
2 files changed, 10 insertions, 1 deletions
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) ; +} |