X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=exec_cmd.c;h=62f51fcd6e367d2dc7e3dc8d967ee05fd1648d04;hb=9a1ae9ab03abaffc977421f182997f3e735e7098;hp=b5e59a9ae9777183d3110defc2c8964aa0d8b62b;hpb=b5233a61955772b4430abb0eb1d03b7fbdd33e6a;p=git.git

diff --git a/exec_cmd.c b/exec_cmd.c
index b5e59a9ae..62f51fcd6 100644
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "exec_cmd.h"
+#include "quote.h"
 #define MAX_ARGS	32
 
 extern char **environ;
@@ -21,7 +22,7 @@ const char *git_exec_path(void)
 		return current_exec_path;
 
 	env = getenv("GIT_EXEC_PATH");
-	if (env) {
+	if (env && *env) {
 		return env;
 	}
 
@@ -29,24 +30,28 @@ const char *git_exec_path(void)
 }
 
 
-int execv_git_cmd(char **argv)
+int execv_git_cmd(const char **argv)
 {
 	char git_command[PATH_MAX + 1];
-	char *tmp;
-	int len, err, i;
+	int i;
 	const char *paths[] = { current_exec_path,
 				getenv("GIT_EXEC_PATH"),
 				builtin_exec_path };
 
-	for (i = 0; i < sizeof(paths)/sizeof(paths[0]); ++i) {
+	for (i = 0; i < ARRAY_SIZE(paths); ++i) {
+		size_t len;
+		int rc;
 		const char *exec_dir = paths[i];
-		if (!exec_dir) continue;
+		const char *tmp;
+
+		if (!exec_dir || !*exec_dir) continue;
 
 		if (*exec_dir != '/') {
 			if (!getcwd(git_command, sizeof(git_command))) {
 				fprintf(stderr, "git: cannot determine "
-					"current directory\n");
-				exit(1);
+					"current directory: %s\n",
+					strerror(errno));
+				break;
 			}
 			len = strlen(git_command);
 
@@ -56,17 +61,28 @@ int execv_git_cmd(char **argv)
 				while (*exec_dir == '/')
 					exec_dir++;
 			}
-			snprintf(git_command + len, sizeof(git_command) - len,
-				 "/%s", exec_dir);
+
+			rc = snprintf(git_command + len,
+				      sizeof(git_command) - len, "/%s",
+				      exec_dir);
+			if (rc < 0 || rc >= sizeof(git_command) - len) {
+				fprintf(stderr, "git: command name given "
+					"is too long.\n");
+				break;
+			}
 		} else {
+			if (strlen(exec_dir) + 1 > sizeof(git_command)) {
+				fprintf(stderr, "git: command name given "
+					"is too long.\n");
+				break;
+			}
 			strcpy(git_command, exec_dir);
 		}
 
 		len = strlen(git_command);
-		len += snprintf(git_command + len, sizeof(git_command) - len,
-				"/git-%s", argv[0]);
-
-		if (sizeof(git_command) <= len) {
+		rc = snprintf(git_command + len, sizeof(git_command) - len,
+			      "/git-%s", argv[0]);
+		if (rc < 0 || rc >= sizeof(git_command) - len) {
 			fprintf(stderr,
 				"git: command name given is too long.\n");
 			break;
@@ -81,10 +97,26 @@ int execv_git_cmd(char **argv)
 		tmp = argv[0];
 		argv[0] = git_command;
 
+		if (getenv("GIT_TRACE")) {
+			const char **p = argv;
+			fputs("trace: exec:", stderr);
+			while (*p) {
+				fputc(' ', stderr);
+				sq_quote_print(stderr, *p);
+				++p;
+			}
+			putc('\n', stderr);
+			fflush(stderr);
+		}
+
 		/* execve() can only ever return if it fails */
-		execve(git_command, argv, environ);
+		execve(git_command, (char **)argv, environ);
 
-		err = errno;
+		if (getenv("GIT_TRACE")) {
+			fprintf(stderr, "trace: exec failed: %s\n",
+				strerror(errno));
+			fflush(stderr);
+		}
 
 		argv[0] = tmp;
 	}
@@ -93,11 +125,11 @@ int execv_git_cmd(char **argv)
 }
 
 
-int execl_git_cmd(char *cmd,...)
+int execl_git_cmd(const char *cmd,...)
 {
 	int argc;
-	char *argv[MAX_ARGS + 1];
-	char *arg;
+	const char *argv[MAX_ARGS + 1];
+	const char *arg;
 	va_list param;
 
 	va_start(param, cmd);