projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
builtin-push: --all and --tags _are_ explicit refspecs
[git.git]
/
exec_cmd.c
diff --git
a/exec_cmd.c
b/exec_cmd.c
index
b5e59a9
..
44bb2f2
100644
(file)
--- a/
exec_cmd.c
+++ b/
exec_cmd.c
@@
-29,17
+29,18
@@
const char *git_exec_path(void)
}
}
-int execv_git_cmd(char **argv)
+int execv_git_cmd(c
onst c
har **argv)
{
char git_command[PATH_MAX + 1];
{
char git_command[PATH_MAX + 1];
- char *tmp;
- int len, err, i;
+ int len, i;
const char *paths[] = { current_exec_path,
getenv("GIT_EXEC_PATH"),
builtin_exec_path };
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) {
const char *exec_dir = paths[i];
const char *exec_dir = paths[i];
+ const char *tmp;
+
if (!exec_dir) continue;
if (*exec_dir != '/') {
if (!exec_dir) continue;
if (*exec_dir != '/') {
@@
-82,9
+83,7
@@
int execv_git_cmd(char **argv)
argv[0] = git_command;
/* execve() can only ever return if it fails */
argv[0] = git_command;
/* execve() can only ever return if it fails */
- execve(git_command, argv, environ);
-
- err = errno;
+ execve(git_command, (char **)argv, environ);
argv[0] = tmp;
}
argv[0] = tmp;
}
@@
-93,11
+92,11
@@
int execv_git_cmd(char **argv)
}
}
-int execl_git_cmd(char *cmd,...)
+int execl_git_cmd(c
onst c
har *cmd,...)
{
int argc;
{
int argc;
- char *argv[MAX_ARGS + 1];
- char *arg;
+ c
onst c
har *argv[MAX_ARGS + 1];
+ c
onst c
har *arg;
va_list param;
va_start(param, cmd);
va_list param;
va_start(param, cmd);