diff options
| author | 2013-04-30 19:27:41 (JST) | |
|---|---|---|
| committer | 2013-04-30 19:29:07 (JST) | |
| commit | 8bf4a0465e81da877e0c81620ae4ac9356145fc9 (patch) | |
| tree | 502c36d0641013bed2c3832963968ec6f13737cf | |
| parent | 8d07ad3388429b6c1361074cbac5dec6afee79d7 (diff) | |
| download | cgit-8bf4a0465e81da877e0c81620ae4ac9356145fc9.zip cgit-8bf4a0465e81da877e0c81620ae4ac9356145fc9.tar.gz | |
ui-snapshot: do not access $HOME
It's a bit tedious to have to do this here too. If we encounter other
issues with $HOME down the line, I'll look into adding some nice utility
functions to handle this, or perhaps giving up on the hope that we could
keep $HOME defined for scripts.
This commit additionally adds a test case, should the issue surface
again.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rwxr-xr-x | tests/t0109-gitconfig.sh | 1 | ||||
| -rw-r--r-- | ui-snapshot.c | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/t0109-gitconfig.sh b/tests/t0109-gitconfig.sh index 24b2942..c9d16a2 100755 --- a/tests/t0109-gitconfig.sh +++ b/tests/t0109-gitconfig.sh | |||
| @@ -37,5 +37,6 @@ test_no_home_access_success foo/tree/file-1 | |||
| 37 | test_no_home_access_success foo/commit | 37 | test_no_home_access_success foo/commit |
| 38 | test_no_home_access_success foo/diff | 38 | test_no_home_access_success foo/diff |
| 39 | test_no_home_access_success foo/patch | 39 | test_no_home_access_success foo/patch |
| 40 | test_no_home_access_success foo/snapshot/master.tar.gz | ||
| 40 | 41 | ||
| 41 | test_done | 42 | test_done |
diff --git a/ui-snapshot.c b/ui-snapshot.c index 42b7489..8a72080 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
| @@ -16,6 +16,7 @@ static int write_archive_type(const char *format, const char *hex, const char *p | |||
| 16 | { | 16 | { |
| 17 | struct argv_array argv = ARGV_ARRAY_INIT; | 17 | struct argv_array argv = ARGV_ARRAY_INIT; |
| 18 | const char **nargv; | 18 | const char **nargv; |
| 19 | char *user_home, *xdg_home; | ||
| 19 | int result; | 20 | int result; |
| 20 | argv_array_push(&argv, "snapshot"); | 21 | argv_array_push(&argv, "snapshot"); |
| 21 | argv_array_push(&argv, format); | 22 | argv_array_push(&argv, format); |
| @@ -38,7 +39,15 @@ static int write_archive_type(const char *format, const char *hex, const char *p | |||
| 38 | /* argv_array guarantees a trailing NULL entry. */ | 39 | /* argv_array guarantees a trailing NULL entry. */ |
| 39 | memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1)); | 40 | memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1)); |
| 40 | 41 | ||
| 42 | user_home = getenv("HOME"); | ||
| 43 | xdg_home = getenv("XDG_CONFIG_HOME"); | ||
| 44 | unsetenv("HOME"); | ||
| 45 | unsetenv("XDG_CONFIG_HOME"); | ||
| 41 | result = write_archive(argv.argc, nargv, NULL, 1, NULL, 0); | 46 | result = write_archive(argv.argc, nargv, NULL, 1, NULL, 0); |
| 47 | if (user_home) | ||
| 48 | setenv("HOME", user_home, 1); | ||
| 49 | if (xdg_home) | ||
| 50 | setenv("XDG_CONFIG_HOME", xdg_home, 1); | ||
| 42 | argv_array_clear(&argv); | 51 | argv_array_clear(&argv); |
| 43 | free(nargv); | 52 | free(nargv); |
| 44 | return result; | 53 | return result; |
