commit bash-20140307 snapshot

trap.c

@@ -89,6 +89,8 @@ extern int line_number;
 extern int sigalrm_seen;
 extern procenv_t alrmbuf;
 
+extern volatile int from_return_trap;
+
 extern char *this_command_name;
 extern sh_builtin_func_t *this_shell_builtin;
 extern procenv_t wait_intr_buf;
@@ -951,8 +953,8 @@ _run_trap_internal (sig, tag)
 #if defined (ARRAY_VARS)
       restore_pipestatus_array (ps);
 #endif
-      running_trap = 0;
 
+      running_trap = 0;
       sigmodes[sig] &= ~SIG_INPROGRESS;
 
       if (sigmodes[sig] & SIG_CHANGED)
@@ -973,7 +975,12 @@ _run_trap_internal (sig, tag)
 	  return_catch_value = trap_exit_value;
 	  COPY_PROCENV (save_return_catch, return_catch);
 	  if (function_code)
-	    longjmp (return_catch, 1);
+	    {
+#if 0
+	      from_return_trap = sig == RETURN_TRAP;
+#endif
+	      longjmp (return_catch, 1);
+	    }
 	}
     }