diff options
author | Tobias Bergkvist <tobias@bergkv.ist> | 2021-12-01 22:49:20 +0100 |
---|---|---|
committer | Tobias Bergkvist <tobias@bergkv.ist> | 2021-12-01 22:49:20 +0100 |
commit | 4e55d34535ae278b6130cba43edab6fd6c95e67d (patch) | |
tree | a04ad0fd056e534ad0bbcfbff57c3d4ae096d63d /pkgs/test/make-binary-wrapper | |
parent | 3a014be2f2230b3228e122b7c74fb7561b495195 (diff) |
Add assertValidEnvName and check that variable name is valid during code generation. Add assert_success, and assert that setenv/unsetenv succeeds to crash if they don't
Diffstat (limited to 'pkgs/test/make-binary-wrapper')
-rw-r--r-- | pkgs/test/make-binary-wrapper/combination.c | 9 | ||||
-rw-r--r-- | pkgs/test/make-binary-wrapper/default.nix | 1 | ||||
-rw-r--r-- | pkgs/test/make-binary-wrapper/env.c | 7 | ||||
-rw-r--r-- | pkgs/test/make-binary-wrapper/invalid-env.c | 18 | ||||
-rw-r--r-- | pkgs/test/make-binary-wrapper/prefix.c | 7 | ||||
-rw-r--r-- | pkgs/test/make-binary-wrapper/suffix.c | 5 |
6 files changed, 39 insertions, 8 deletions
diff --git a/pkgs/test/make-binary-wrapper/combination.c b/pkgs/test/make-binary-wrapper/combination.c index 5e4e1168f4a02..a4082ac4aea05 100644 --- a/pkgs/test/make-binary-wrapper/combination.c +++ b/pkgs/test/make-binary-wrapper/combination.c @@ -10,6 +10,9 @@ #include <stdlib.h> #include <string.h> #include <assert.h> +#include <stdio.h> + +#define assert_success(e) do { if ((e) < 0) { perror(#e); exit(1); } } while (0) char *concat3(char *x, char *y, char *z) { int xn = strlen(x); @@ -27,19 +30,19 @@ char *concat3(char *x, char *y, char *z) { void set_env_prefix(char *env, char *sep, char *val) { char *existing = getenv(env); if (existing) val = concat3(val, sep, existing); - setenv(env, val, 1); + assert_success(setenv(env, val, 1)); if (existing) free(val); } void set_env_suffix(char *env, char *sep, char *val) { char *existing = getenv(env); if (existing) val = concat3(existing, sep, val); - setenv(env, val, 1); + assert_success(setenv(env, val, 1)); if (existing) free(val); } int main(int argc, char **argv) { - setenv("MESSAGE", "HELLO", 0); + assert_success(setenv("MESSAGE", "HELLO", 0)); set_env_prefix("PATH", ":", "/usr/bin/"); set_env_suffix("PATH", ":", "/usr/local/bin/"); putenv("MESSAGE2=WORLD"); diff --git a/pkgs/test/make-binary-wrapper/default.nix b/pkgs/test/make-binary-wrapper/default.nix index 72e7fb094a482..1972b03da25ba 100644 --- a/pkgs/test/make-binary-wrapper/default.nix +++ b/pkgs/test/make-binary-wrapper/default.nix @@ -29,6 +29,7 @@ let env = makeGoldenTest { name = "env"; filename = ./env.c; }; prefix = makeGoldenTest { name = "prefix"; filename = ./prefix.c; }; suffix = makeGoldenTest { name = "suffix"; filename = ./suffix.c; }; + invalid-env = makeGoldenTest { name = "invalid-env"; filename = ./invalid-env.c; }; }; in runCommand "make-binary-wrapper-test" { passthru = tests; diff --git a/pkgs/test/make-binary-wrapper/env.c b/pkgs/test/make-binary-wrapper/env.c index 89f1f496b3497..a1b50b1c3630c 100644 --- a/pkgs/test/make-binary-wrapper/env.c +++ b/pkgs/test/make-binary-wrapper/env.c @@ -6,11 +6,14 @@ #include <unistd.h> #include <stdlib.h> +#include <stdio.h> + +#define assert_success(e) do { if ((e) < 0) { perror(#e); exit(1); } } while (0) int main(int argc, char **argv) { putenv("PART1=HELLO"); - setenv("PART2", "WORLD", 0); - unsetenv("SOME_OTHER_VARIABLE"); + assert_success(setenv("PART2", "WORLD", 0)); + assert_success(unsetenv("SOME_OTHER_VARIABLE")); putenv("PART3=\"!!\n\""); argv[0] = "/hello/world"; return execv("/hello/world", argv); diff --git a/pkgs/test/make-binary-wrapper/invalid-env.c b/pkgs/test/make-binary-wrapper/invalid-env.c new file mode 100644 index 0000000000000..02f7cd01a5944 --- /dev/null +++ b/pkgs/test/make-binary-wrapper/invalid-env.c @@ -0,0 +1,18 @@ +// makeCWrapper /bad/env/example \ + --set "=" "TEST1" \ + --set-default "" "TEST2" + +#include <unistd.h> +#include <stdlib.h> +#include <stdio.h> + +#define assert_success(e) do { if ((e) < 0) { perror(#e); exit(1); } } while (0) + +int main(int argc, char **argv) { + putenv("==TEST1"); + #error Illegal environment variable name `=` (cannot contain `=`) + assert_success(setenv("", "TEST2", 0)); + #error Environment variable name can't be empty. + argv[0] = "/bad/env/example"; + return execv("/bad/env/example", argv); +} \ No newline at end of file diff --git a/pkgs/test/make-binary-wrapper/prefix.c b/pkgs/test/make-binary-wrapper/prefix.c index fa333013cd02e..8f7dd9b679c45 100644 --- a/pkgs/test/make-binary-wrapper/prefix.c +++ b/pkgs/test/make-binary-wrapper/prefix.c @@ -6,6 +6,9 @@ #include <stdlib.h> #include <string.h> #include <assert.h> +#include <stdio.h> + +#define assert_success(e) do { if ((e) < 0) { perror(#e); exit(1); } } while (0) char *concat3(char *x, char *y, char *z) { int xn = strlen(x); @@ -23,7 +26,7 @@ char *concat3(char *x, char *y, char *z) { void set_env_prefix(char *env, char *sep, char *val) { char *existing = getenv(env); if (existing) val = concat3(val, sep, existing); - setenv(env, val, 1); + assert_success(setenv(env, val, 1)); if (existing) free(val); } @@ -32,4 +35,4 @@ int main(int argc, char **argv) { set_env_prefix("PATH", ":", "/usr/local/bin/"); argv[0] = "/path/to/executable"; return execv("/path/to/executable", argv); -} \ No newline at end of file +} diff --git a/pkgs/test/make-binary-wrapper/suffix.c b/pkgs/test/make-binary-wrapper/suffix.c index a299f1fa0bd66..17160465b41e1 100644 --- a/pkgs/test/make-binary-wrapper/suffix.c +++ b/pkgs/test/make-binary-wrapper/suffix.c @@ -6,6 +6,9 @@ #include <stdlib.h> #include <string.h> #include <assert.h> +#include <stdio.h> + +#define assert_success(e) do { if ((e) < 0) { perror(#e); exit(1); } } while (0) char *concat3(char *x, char *y, char *z) { int xn = strlen(x); @@ -23,7 +26,7 @@ char *concat3(char *x, char *y, char *z) { void set_env_suffix(char *env, char *sep, char *val) { char *existing = getenv(env); if (existing) val = concat3(existing, sep, val); - setenv(env, val, 1); + assert_success(setenv(env, val, 1)); if (existing) free(val); } |