undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/waitpid' into next

Browse Source 
* jc/waitpid:
  Restore SIGCHLD to SIG_DFL where we care about waitpid().
This commit is contained in:
Junio C Hamano 2006-06-19 18:47:51 -07:00
commit 592689c461
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
connect.c
View File

@ -581,6 +581,11 @@ int git_connect(int fd[2], char *url, const char *prog)
enum protocol protocol = PROTO_LOCAL; enum protocol protocol = PROTO_LOCAL;
int free_path = 0; int free_path = 0;
/* Without this we cannot rely on waitpid() to tell
* what happened to our children.
*/
signal(SIGCHLD, SIG_DFL);
host = strstr(url, "://"); host = strstr(url, "://");
if(host) { if(host) {
*host = '\0'; *host = '\0';

5
daemon.c
View File

@ -671,6 +671,11 @@ int main(int argc, char **argv)
int inetd_mode = 0; int inetd_mode = 0;
int i; int i;
/* Without this we cannot rely on waitpid() to tell
* what happened to our children.
*/
signal(SIGCHLD, SIG_DFL);
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
char *arg = argv[i]; char *arg = argv[i];

5
merge-index.c
View File

@ -99,6 +99,11 @@ int main(int argc, char **argv)
{ {
int i, force_file = 0; int i, force_file = 0;
/* Without this we cannot rely on waitpid() to tell
* what happened to our children.
*/
signal(SIGCHLD, SIG_DFL);
if (argc < 3) if (argc < 3)
usage("git-merge-index [-o] [-q] <merge-program> (-a | <filename>*)"); usage("git-merge-index [-o] [-q] <merge-program> (-a | <filename>*)");