Restore SIGCHLD to SIG_DFL where we care about waitpid().
It was reported that under one implementation of socks client "git clone" fails with "error: waitpid failed (No child processes)", because "git" is spawned after setting SIGCHLD to SIG_IGN. Arguably it may be a broken setting, but we should protect ourselves so that we can get reliable results from waitpid() for the children we care about. This patch resets SIGCHLD to SIG_DFL in three places: - connect.c::git_connect() - initiators of git native protocol transfer are covered with this. - daemon.c::main() - obviously. - merge-index.c::main() - obviously. There are other programs that do fork() but do not waitpid(): http-push, imap-send. upload-pack does not either, but in the case of that program, each of the forked halves runs exec() another program, so this change would not have much effect there. Signed-off-by: Junio C Hamano <junkio@cox.net>maint
							parent
							
								
									d281786fcd
								
							
						
					
					
						commit
						f0b7367cb1
					
				|  | @ -581,6 +581,11 @@ int git_connect(int fd[2], char *url, const char *prog) | |||
| 	enum protocol protocol = PROTO_LOCAL; | ||||
| 	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, "://"); | ||||
| 	if(host) { | ||||
| 		*host = '\0'; | ||||
|  |  | |||
							
								
								
									
										5
									
								
								daemon.c
								
								
								
								
							
							
						
						
									
										5
									
								
								daemon.c
								
								
								
								
							|  | @ -671,6 +671,11 @@ int main(int argc, char **argv) | |||
| 	int inetd_mode = 0; | ||||
| 	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++) { | ||||
| 		char *arg = argv[i]; | ||||
|  | ||||
|  |  | |||
|  | @ -99,6 +99,11 @@ int main(int argc, char **argv) | |||
| { | ||||
| 	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) | ||||
| 		usage("git-merge-index [-o] [-q] <merge-program> (-a | <filename>*)"); | ||||
|  | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Junio C Hamano
						Junio C Hamano