X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.c;h=32309971222bfd0647cb3885d9cf4903b7dfaacf;hb=06cd3b94b27c285fc9877e7c6d9e1f35fbc0a7a4;hp=95488cdd9f026f897c688428f7090aa59d099bad;hpb=211232bae64bcc60bbf5d1b5e5b2344c22ed767e;p=git.git

diff --git a/diff.c b/diff.c
index 95488cdd..32309971 100644
--- a/diff.c
+++ b/diff.c
@@ -4,14 +4,15 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <signal.h>
+#include <limits.h>
 #include "cache.h"
 #include "diff.h"
 
-static char *diff_opts = "-pu";
+static const char *diff_opts = "-pu";
 
 static const char *external_diff(void)
 {
-	static char *external_diff_cmd = NULL;
+	static const char *external_diff_cmd = NULL;
 	static int done_preparing = 0;
 
 	if (done_preparing)
@@ -25,11 +26,11 @@ static const char *external_diff(void)
 	 *
 	 * GIT_DIFF_OPTS="-c";
 	 */
-	if (getenv("GIT_EXTERNAL_DIFF"))
-		external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
+	if (gitenv("GIT_EXTERNAL_DIFF"))
+		external_diff_cmd = gitenv("GIT_EXTERNAL_DIFF");
 
 	/* In case external diff fails... */
-	diff_opts = getenv("GIT_DIFF_OPTS") ? : diff_opts;
+	diff_opts = gitenv("GIT_DIFF_OPTS") ? : diff_opts;
 
 	done_preparing = 1;
 	return external_diff_cmd;