aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-01-06 20:17:48 -0500
committerJunio C Hamano <gitster@pobox.com>2017-01-09 13:41:35 -0800
commit246f0edec0b789ccfeebcf7fef85417b7cb04425 (patch)
tree5ab877ad21dceefc6ce5233270b1863c00f18ecb
parent2b296c93d49d65303a4ce291225c8755eeab1ff8 (diff)
downloadgit-246f0edec0b789ccfeebcf7fef85417b7cb04425.tar.gz
git-246f0edec0b789ccfeebcf7fef85417b7cb04425.tar.xz
execv_dashed_external: stop exiting with negative code
When we try to exec a git sub-command, we pass along the status code from run_command(). But that may return -1 if we ran into an error with pipe() or execve(). This tends to work (and end up as 255 due to twos-complement wraparound and truncation), but in general it's probably a good idea to avoid negative exit codes for portability. We can easily translate to the normal generic "128" code we get when syscalls cause us to die. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--git.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/git.c b/git.c
index d0e04d5c9..bc2f2a7ec 100644
--- a/git.c
+++ b/git.c
@@ -593,12 +593,16 @@ static void execv_dashed_external(const char **argv)
trace_argv_printf(cmd.args.argv, "trace: exec:");
/*
- * if we fail because the command is not found, it is
- * OK to return. Otherwise, we just pass along the status code.
+ * If we fail because the command is not found, it is
+ * OK to return. Otherwise, we just pass along the status code,
+ * or our usual generic code if we were not even able to exec
+ * the program.
*/
status = run_command(&cmd);
- if (status >= 0 || errno != ENOENT)
+ if (status >= 0)
exit(status);
+ else if (errno != ENOENT)
+ exit(128);
}
static int run_argv(int *argcp, const char ***argv)