diff options
author | Jason A. Donenfeld | 2013-05-25 19:25:56 +0200 |
---|---|---|
committer | Jason A. Donenfeld | 2013-05-25 20:33:28 +0200 |
commit | 03eb76dfad2887127581f5f1b4e2edbe8c4ca5fe (patch) | |
tree | fb5961f5c5f99d0b3dda25632a74036f10b8dda9 /ui-snapshot.c | |
parent | 5a4156ef951162d669e7170b440fad6e4c9e306f (diff) | |
download | cgit-03eb76dfad2887127581f5f1b4e2edbe8c4ca5fe.tar.gz cgit-03eb76dfad2887127581f5f1b4e2edbe8c4ca5fe.tar.bz2 cgit-03eb76dfad2887127581f5f1b4e2edbe8c4ca5fe.zip |
cgit.c: Do not reset HOME after unsetting it.
The number of odd cases in which git will try to read config is far too
great to keep putting a bandaid over each one, so we'll just unset it.
If it turns out that scripts really liked to know about $HOME, we can
always reset it in the filter forks.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'ui-snapshot.c')
-rw-r--r-- | ui-snapshot.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index 8a72080..42b7489 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -16,7 +16,6 @@ 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; | ||
20 | int result; | 19 | int result; |
21 | argv_array_push(&argv, "snapshot"); | 20 | argv_array_push(&argv, "snapshot"); |
22 | argv_array_push(&argv, format); | 21 | argv_array_push(&argv, format); |
@@ -39,15 +38,7 @@ static int write_archive_type(const char *format, const char *hex, const char *p | |||
39 | /* argv_array guarantees a trailing NULL entry. */ | 38 | /* argv_array guarantees a trailing NULL entry. */ |
40 | memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1)); | 39 | memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1)); |
41 | 40 | ||
42 | user_home = getenv("HOME"); | ||
43 | xdg_home = getenv("XDG_CONFIG_HOME"); | ||
44 | unsetenv("HOME"); | ||
45 | unsetenv("XDG_CONFIG_HOME"); | ||
46 | result = write_archive(argv.argc, nargv, NULL, 1, NULL, 0); | 41 | 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); | ||
51 | argv_array_clear(&argv); | 42 | argv_array_clear(&argv); |
52 | free(nargv); | 43 | free(nargv); |
53 | return result; | 44 | return result; |