rcolebaugh / rpms / bash

Forked from rpms/bash a year ago
Clone

Blame SOURCES/bash-4.1-defer-sigchld-trap.patch

287226
diff -pruN bash-4.1/jobs.c bash-4.1.patched/jobs.c
287226
--- bash-4.1/jobs.c	2009-11-30 03:42:05.000000000 +0530
287226
+++ bash-4.1.patched/jobs.c	2012-03-06 16:44:15.706595703 +0530
287226
@@ -3037,6 +3037,7 @@ waitchld (wpid, block)
287226
   PROCESS *child;
287226
   pid_t pid;
287226
   int call_set_current, last_stopped_job, job, children_exited, waitpid_flags;
287226
+  int called_from_sighand = sigchld;
287226
   static int wcontinued = WCONTINUED;	/* run-time fix for glibc problem */
287226
 
287226
   call_set_current = children_exited = 0;
287226
@@ -3161,7 +3162,17 @@ waitchld (wpid, block)
287226
 	  longjmp (wait_intr_buf, 1);
287226
 	}
287226
 
287226
-      run_sigchld_trap (children_exited);
287226
+      /* Queue up the trap handler if we're called directly from within the
287226
+         signal handler. */
287226
+      if (called_from_sighand)
287226
+	{
287226
+	  int i = children_exited;
287226
+	  interrupt_immediately = 0;
287226
+	  while (i--)
287226
+	    trap_handler (SIGCHLD);
287226
+	}
287226
+      else
287226
+	run_sigchld_trap (children_exited);
287226
     }
287226
 
287226
   /* We have successfully recorded the useful information about this process