fix for SIGINT in sourced script

diff --git a/builtins/trap.def b/builtins/trap.def
index 57d9b52277a0ac5945749314d32717c969cfafef..d43b0ef665bb1cae4945b9c5a2f6adc9756d28be 100644 (file)
--- a/builtins/trap.def
+++ b/builtins/trap.def
@@ -98,6 +98,7 @@ static int display_traps __P((WORD_LIST *));
 #define IGNORE 2               /* Ignore this signal. */
 
 extern int posixly_correct, subshell_environment;
+extern int sourcelevel, running_trap;
 
 int
 trap_builtin (list)
@@ -212,6 +213,9 @@ trap_builtin (list)
                           was SIG_IGN? */
                        if (interactive)
                          set_signal_handler (SIGINT, sigint_sighandler);
+                       /* special cases for interactive == 0 */
+                       else if (interactive_shell && (sourcelevel||running_trap))
+                         set_signal_handler (SIGINT, sigint_sighandler);
                        else
                          set_signal_handler (SIGINT, termsig_sighandler);
                        break;

diff --git a/patchlevel.h b/patchlevel.h
index 9be226c360d3efc3021b1d294262e851979f8a60..2060b58feed0c164c5116183fbdf5337212f6721 100644 (file)
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
    regexp `^#define[   ]*PATCHLEVEL', since that's what support/mkversion.sh
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 22
+#define PATCHLEVEL 23
 
 #endif /* _PATCHLEVEL_H_ */