diff options
Diffstat (limited to 'pkgs/test/make-binary-wrapper/combination.c')
-rw-r--r-- | pkgs/test/make-binary-wrapper/combination.c | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/pkgs/test/make-binary-wrapper/combination.c b/pkgs/test/make-binary-wrapper/combination.c index 4ab44281ef143..bb35d0d99f314 100644 --- a/pkgs/test/make-binary-wrapper/combination.c +++ b/pkgs/test/make-binary-wrapper/combination.c @@ -6,39 +6,36 @@ --add-flags "-x -y -z" \ --set MESSAGE2 WORLD +#define _GNU_SOURCE /* See feature_test_macros(7) */ #include <unistd.h> #include <stdlib.h> -#include <string.h> #include <assert.h> #include <stdio.h> #define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0) -char *concat3(char *x, char *y, char *z) { - int xn = strlen(x); - int yn = strlen(y); - int zn = strlen(z); - char *res = malloc(sizeof(*res)*(xn + yn + zn + 1)); - assert(res != NULL); - strncpy(res, x, xn); - strncpy(res + xn, y, yn); - strncpy(res + xn + yn, z, zn); - res[xn + yn + zn] = '\0'; - return res; -} - -void set_env_prefix(char *env, char *sep, char *val) { +void set_env_prefix(char *env, char *sep, char *prefix) { char *existing = getenv(env); - if (existing) val = concat3(val, sep, existing); - assert_success(setenv(env, val, 1)); - if (existing) free(val); + if (existing) { + char *val; + assert_success(asprintf(&val, "%s%s%s", prefix, sep, existing)); + assert_success(setenv(env, val, 1)); + free(val); + } else { + assert_success(setenv(env, prefix, 1)); + } } -void set_env_suffix(char *env, char *sep, char *val) { +void set_env_suffix(char *env, char *sep, char *suffix) { char *existing = getenv(env); - if (existing) val = concat3(existing, sep, val); - assert_success(setenv(env, val, 1)); - if (existing) free(val); + if (existing) { + char *val; + assert_success(asprintf(&val, "%s%s%s", existing, sep, suffix)); + assert_success(setenv(env, val, 1)); + free(val); + } else { + assert_success(setenv(env, suffix, 1)); + } } int main(int argc, char **argv) { |