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>
This commit is contained in:
parent
3a2674337c
commit
9a79c5a8b4
3
git.c
3
git.c
@ -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] = ':';
|
||||
|
Loading…
Reference in New Issue
Block a user