From: Junio C Hamano <junkio@cox.net>
Date: Sun, 4 Dec 2005 22:59:58 +0000 (-0800)
Subject: git.c: two fixes, gitsetenv type and off-by-one error.
X-Git-Tag: v0.99.9m^2~84
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9a79c5a8b4e280601bcbeeed22e1e4968d06c10e;p=git.git

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>
---

diff --git a/git.c b/git.c
index 619f25acf..0975fc7ac 100644
--- a/git.c
+++ b/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] = ':';