commit bash-20071204 snapshot

diff --git a/execute_cmd.c b/execute_cmd.c
index be51a3334225c4c4ced7cf584c2889d74840f41b..4a04920c54d5795f9afd372493acf9caddc7b758 100644 (file)
--- a/execute_cmd.c
+++ b/execute_cmd.c
@@ -714,6 +714,7 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out,
               subshells forked to execute builtin commands (e.g., in
               pipelines) to be waited for twice. */
              exec_result = wait_for (last_made_pid);
+itrace("execute_command_internal: wait_for (%d) = %d", last_made_pid, exec_result);
          }
       }
 
@@ -893,6 +894,7 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out,
 #endif
 
   last_command_exit_value = exec_result;
+itrace("execute_command_internal: last_command_exit_value -> %d last_command_exit_signal = %d", last_command_exit_value, last_command_exit_signal);
   run_pending_traps ();
 #if 0
   if (running_trap == 0)

diff --git a/jobs.c b/jobs.c
index 82a6b488d10c0cf3d10a2906e2dd5cb1e0de0ad1..6c0dff1a64ebaadc0f6cf1250ac0290b390eefc2 100644 (file)
--- a/jobs.c
+++ b/jobs.c
@@ -453,6 +453,7 @@ start_pipeline ()
     {
       cleanup_the_pipeline ();
       pipeline_pgrp = 0;
+itrace("start_pipeline: set pipeline_pgrp = 0");
 #if defined (PGRP_PIPE)
       pipe_close (pgrp_pipe);
 #endif
@@ -566,6 +567,7 @@ stop_pipeline (async, deferred)
       the_pipeline = (PROCESS *)NULL;
       newjob->pgrp = pipeline_pgrp;
       pipeline_pgrp = 0;
+itrace("stop_pipeline: set pipeline_pgrp = 0");
 
       newjob->flags = 0;
 
@@ -1684,6 +1686,8 @@ make_child (command, async_p)
   sigemptyset (&oset);
   sigprocmask (SIG_BLOCK, &set, &oset);
 
+itrace("make_child start: pipeline_pgrp = %d", pipeline_pgrp);
+
   making_children ();
 
 #if defined (BUFFERED_INPUT)
@@ -1742,7 +1746,10 @@ make_child (command, async_p)
             process group. */
 
          if (pipeline_pgrp == 0)       /* This is the first child. */
+{
            pipeline_pgrp = mypid;
+itrace("make_child: child proc: set pipeline_pgrp = %d (mypid)", pipeline_pgrp);
+}
 
          /* Check for running command in backquotes. */
          if (pipeline_pgrp == shell_pgrp)
@@ -1768,7 +1775,10 @@ make_child (command, async_p)
             shell's process group (we could be in the middle of a
             pipeline, for example). */
          if (async_p == 0 && pipeline_pgrp != shell_pgrp && ((subshell_environment&SUBSHELL_ASYNC) == 0))
+{
+itrace("make_child: give terminal to %d shell_pgrp = %d subshell_environment = %d", pipeline_pgrp, shell_pgrp, subshell_environment);
            give_terminal_to (pipeline_pgrp, 0);
+}
 
 #if defined (PGRP_PIPE)
          if (pipeline_pgrp == mypid)
@@ -1778,7 +1788,10 @@ make_child (command, async_p)
       else                     /* Without job control... */
        {
          if (pipeline_pgrp == 0)
+{
            pipeline_pgrp = shell_pgrp;
+itrace("make_child: child proc: set pipeline_pgrp = %d (shell_pgrp)", pipeline_pgrp);
+}
 
          /* If these signals are set to SIG_DFL, we encounter the curious
             situation of an interactive ^Z to a running process *working*
@@ -1823,6 +1836,7 @@ make_child (command, async_p)
          if (pipeline_pgrp == 0)
            {
              pipeline_pgrp = pid;
+itrace("make_child: parent proc: set pipeline_pgrp = %d (pid)", pipeline_pgrp);
              /* Don't twiddle terminal pgrps in the parent!  This is the bug,
                 not the good thing of twiddling them in the child! */
              /* give_terminal_to (pipeline_pgrp, 0); */
@@ -1836,7 +1850,11 @@ make_child (command, async_p)
       else
        {
          if (pipeline_pgrp == 0)
+{
            pipeline_pgrp = shell_pgrp;
+itrace("make_child: parent proc: set pipeline_pgrp = %d (shell_pgrp)", pipeline_pgrp);
+}
+          
        }
 
       /* Place all processes into the jobs array regardless of the
@@ -2212,7 +2230,7 @@ wait_sigint_handler (sig)
   /* XXX - should this be interrupt_state?  If it is, the shell will act
      as if it got the SIGINT interrupt. */
   wait_sigint_received = 1;
-
+itrace("wait_sigint_handler: wait_sigint_received -> 1");
   /* Otherwise effectively ignore the SIGINT and allow the running job to
      be killed. */
   SIGRETURN (0);
@@ -2319,11 +2337,14 @@ wait_for (pid)
      to finish.  We don't want the shell to exit if an interrupt is
      received, only if one of the jobs run is killed via SIGINT.  If
      job control is not set, the job will be run in the same pgrp as
-     the shell, and the shell will see any signals the job gets. */
+     the shell, and the shell will see any signals the job gets.  In
+     fact, we want this set every time the waiting shell and the waited-
+     for process are in the same process group, including command
+     substitution. */
 
   /* This is possibly a race condition -- should it go in stop_pipeline? */
   wait_sigint_received = 0;
-  if (job_control == 0)
+  if (job_control == 0 || (subshell_environment&SUBSHELL_COMSUB))
     {
       old_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler);
       if (old_sigint_handler == SIG_IGN)
@@ -2427,6 +2448,7 @@ wait_for (pid)
   /* XXX */
   if ((job != NO_JOB && JOBSTATE (job) == JSTOPPED) || WIFSTOPPED (child->status))
     termination_state = 128 + WSTOPSIG (child->status);
+itrace("wait_for (%d): termination_state = %d last_command_exit_signal = %d", pid, termination_state, last_command_exit_signal);
 
   if (job == NO_JOB || IS_JOBCONTROL (job))
     {
@@ -3004,6 +3026,7 @@ waitchld (wpid, block)
          wcontinued = 0;
          continue;     /* jump back to the test and retry without WCONTINUED */
        }
+itrace("waitchld: waitpid returns %d (status %d)", pid, status);
 
       /* The check for WNOHANG is to make sure we decrement sigchld only
         if it was non-zero before we called waitpid. */
@@ -4024,7 +4047,10 @@ set_job_control (arg)
   /* If we're turning on job control, reset pipeline_pgrp so make_child will
      put new child processes into the right pgrp */
   if (job_control != old && job_control)
+{
     pipeline_pgrp = 0;
+itrace("set_job_control: set pipeline_pgrp = 0");
+}
 
   return (old);
 }

diff --git a/sig.c b/sig.c
index d3067dda373cf39cf1a3aeb07be18d559f533248..5bb91e0b35820349dffa38b5d87a2ca45d6356a6 100644 (file)
--- a/sig.c
+++ b/sig.c
@@ -508,7 +508,7 @@ sigint_sighandler (sig)
      right.  Should it be set unconditionally? */
   if (interrupt_state == 0)
     ADDINTERRUPT;
-
+itrace("sigint_sighandler");
   if (interrupt_immediately)
     {
       interrupt_immediately = 0;

diff --git a/subst.c b/subst.c
index 7a990774c8e1a9a522dee0119aa1a29c1d901ca8..306092e44bd105e798d176340e07f91237d7d6b9 100644 (file)
--- a/subst.c
+++ b/subst.c
@@ -4666,7 +4666,10 @@ command_substitute (string, quoted)
   old_pipeline_pgrp = pipeline_pgrp;
   /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline. */
   if ((subshell_environment & SUBSHELL_PIPE) == 0)
+{
     pipeline_pgrp = shell_pgrp;
+itrace("command_substitute: set pipeline_pgrp = shell_pgrp = %d", pipeline_pgrp);
+}
   cleanup_the_pipeline ();
 #endif /* JOB_CONTROL */
 
@@ -4680,9 +4683,14 @@ command_substitute (string, quoted)
     reset_signal_handlers ();
 
 #if defined (JOB_CONTROL)
+  /* XXX DO THIS ONLY IN PARENT ? XXX */
   set_sigchld_handler ();
   stop_making_children ();
-  pipeline_pgrp = old_pipeline_pgrp;
+  if (pid != 0)
+{
+    pipeline_pgrp = old_pipeline_pgrp;
+itrace("command_substitute: set pipeline_pgrp = %d (old_pipeline_pgrp)", pipeline_pgrp);
+}
 #else
   stop_making_children ();
 #endif /* JOB_CONTROL */
@@ -4789,6 +4797,7 @@ command_substitute (string, quoted)
 
       current_command_subst_pid = pid;
       last_command_exit_value = wait_for (pid);
+itrace("command_substitute: waited for pid %d: status %d", pid, last_command_exit_value);
       last_command_subst_pid = pid;
       last_made_pid = old_pid;