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>
Daniel Barkalow committed
Dec 7, 2005 at 21:04 UTC
128aed684d0b3099092b7597c8644599b45b7503
3 files changed
+17
-3
receive-pack.c
+1
-1
@@ -173,7 +173,7 @@ static void run_update_post_hook(struct command *cmd)
173
argc++;
174
}
175
argv[argc] = NULL;
176
- run_command_v(argc, argv);
176
+ run_command_v_opt(argc, argv, RUN_COMMAND_NO_STDIO);
177
}
178
179
/*
run-command.c
+13
-2
@@ -2,13 +2,19 @@
2
#include "run-command.h"
3
#include <sys/wait.h>
4
5
-int run_command_v(int argc, char **argv)
5
+int run_command_v_opt(int argc, char **argv, int flags)
6
{
7
pid_t pid = fork();
8
9
if (pid < 0)
10
return -ERR_RUN_COMMAND_FORK;
11
if (!pid) {
12
+ if (flags & RUN_COMMAND_NO_STDIO) {
13
+ int fd = open("/dev/null", O_RDWR);
14
+ dup2(fd, 0);
15
+ dup2(fd, 1);
16
+ close(fd);
17
+ }
18
execvp(argv[0], (char *const*) argv);
19
die("exec %s failed.", argv[0]);
20
}
@@ -36,6 +42,11 @@ int run_command_v(int argc, char **argv)
42
}
43
}
44
45
+int run_command_v(int argc, char **argv)
46
+{
47
+ return run_command_v_opt(argc, argv, 0);
48
+}
49
+
50
int run_command(const char *cmd, ...)
51
{
52
int argc;
@@ -54,5 +65,5 @@ int run_command(const char *cmd, ...)
65
va_end(param);
66
if (MAX_RUN_COMMAND_ARGS <= argc)
67
return error("too many args to run %s", cmd);
57
- return run_command_v(argc, argv);
68
+ return run_command_v_opt(argc, argv, 0);
69
}
run-command.h
+3
@@ -11,6 +11,9 @@ enum {
11
ERR_RUN_COMMAND_WAITPID_NOEXIT,
12
};
13
14
+#define RUN_COMMAND_NO_STDIO 1
15
+
16
+int run_command_v_opt(int argc, char **argv, int opt);
17
int run_command_v(int argc, char **argv);
18
int run_command(const char *cmd, ...);
19