diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-12-04 14:59:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-04 14:59:58 -0800 |
| commit | 9a79c5a8b4e280601bcbeeed22e1e4968d06c10e (patch) | |
| tree | 4957a416f66f1e8afaf189b45136fb4a070eadcb | |
| parent | compat/setenv: do not free what we fed putenv(3). (diff) | |
| download | tgif-9a79c5a8b4e280601bcbeeed22e1e4968d06c10e.tar.xz | |
git.c: two fixes, gitsetenv type and off-by-one error.
gitsetenv as implemented in compat/setenv.c takes two const char*
and int; match that.
Also fix an incorrect attempt in prepend_to_path() to
NUL-terminate the string which stuffed the NUL character at one
past the end of allocation, and was not needed to begin with (we
copy the old_path string including the NUL which terminates it).
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | git.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -14,7 +14,7 @@ #endif #ifdef NO_SETENV -extern int gitsetenv(char *name, char *value, int overwrite); +extern int gitsetenv(const char *, const char *, int); #endif static const char git_usage[] = @@ -192,7 +192,6 @@ static void prepend_to_path(const char *dir, int len) path_len = len + strlen(old_path) + 1; path = malloc(path_len + 1); - path[path_len + 1] = '\0'; memcpy(path, dir, len); path[len] = ':'; |