summaryrefslogtreecommitdiff
path: root/run-command.c
diff options
context:
space:
mode:
authorDaniel Barkalow <barkalow@iabervon.org>2005-12-08 02:04:38 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-08 05:05:39 (GMT)
commit128aed684d0b3099092b7597c8644599b45b7503 (patch)
tree52e84bd6a1c9bf70ea8dc44f7759d93cd43f1283 /run-command.c
parent64224caf888253601b7285ab242f4a12779894b9 (diff)
downloadgit-128aed684d0b3099092b7597c8644599b45b7503.zip
git-128aed684d0b3099092b7597c8644599b45b7503.tar.gz
git-128aed684d0b3099092b7597c8644599b45b7503.tar.bz2
Clean up file descriptors when calling hooks.
When calling post-update hook, don't leave stdin and stdout connected to the pushing connection. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'run-command.c')
-rw-r--r--run-command.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/run-command.c b/run-command.c
index 5787a50..8bf5922 100644
--- a/run-command.c
+++ b/run-command.c
@@ -2,13 +2,19 @@
#include "run-command.h"
#include <sys/wait.h>
-int run_command_v(int argc, char **argv)
+int run_command_v_opt(int argc, char **argv, int flags)
{
pid_t pid = fork();
if (pid < 0)
return -ERR_RUN_COMMAND_FORK;
if (!pid) {
+ if (flags & RUN_COMMAND_NO_STDIO) {
+ int fd = open("/dev/null", O_RDWR);
+ dup2(fd, 0);
+ dup2(fd, 1);
+ close(fd);
+ }
execvp(argv[0], (char *const*) argv);
die("exec %s failed.", argv[0]);
}
@@ -36,6 +42,11 @@ int run_command_v(int argc, char **argv)
}
}
+int run_command_v(int argc, char **argv)
+{
+ return run_command_v_opt(argc, argv, 0);
+}
+
int run_command(const char *cmd, ...)
{
int argc;
@@ -54,5 +65,5 @@ int run_command(const char *cmd, ...)
va_end(param);
if (MAX_RUN_COMMAND_ARGS <= argc)
return error("too many args to run %s", cmd);
- return run_command_v(argc, argv);
+ return run_command_v_opt(argc, argv, 0);
}