patches/bash/bash44-023

   1                              BASH PATCH REPORT
   2                              =================
   3
   4 Bash-Release:   4.4
   5 Patch-ID:       bash44-023
   6
   7 Bug-Reported-by:        Martijn Dekker <martijn@inlv.org>
   8 Bug-Reference-ID:       <5326d6b9-2625-1d32-3e6e-ad1d15462c09@inlv.org>
   9 Bug-Reference-URL:      http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00041.html
  10
  11 Bug-Description:
  12
  13 When sourcing a file from an interactive shell, setting the SIGINT handler
  14 to the default and typing ^C will cause the shell to exit.
  15
  16 Patch (apply with `patch -p0'):
  17
  18 *** ../bash-4.4-patched/builtins/trap.def       2016-01-25 13:32:38.000000000 -0500
  19 --- builtins/trap.def   2016-11-06 12:04:35.000000000 -0500
  20 ***************
  21 *** 99,102 ****
  22 --- 99,103 ----
  23
  24   extern int posixly_correct, subshell_environment;
  25 + extern int sourcelevel, running_trap;
  26
  27   int
  28 ***************
  29 *** 213,216 ****
  30 --- 214,220 ----
  31                         if (interactive)
  32                           set_signal_handler (SIGINT, sigint_sighandler);
  33 +                       /* special cases for interactive == 0 */
  34 +                       else if (interactive_shell && (sourcelevel||running_trap))
  35 +                         set_signal_handler (SIGINT, sigint_sighandler);
  36                         else
  37                           set_signal_handler (SIGINT, termsig_sighandler);
  38 *** ../bash-4.4/patchlevel.h    2016-06-22 14:51:03.000000000 -0400
  39 --- patchlevel.h        2016-10-01 11:01:28.000000000 -0400
  40 ***************
  41 *** 26,30 ****
  42      looks for to find the patch level (for the sccs version string). */
  43
  44 ! #define PATCHLEVEL 22
  45
  46   #endif /* _PATCHLEVEL_H_ */
  47 --- 26,30 ----
  48      looks for to find the patch level (for the sccs version string). */
  49
  50 ! #define PATCHLEVEL 23
  51
  52   #endif /* _PATCHLEVEL_H_ */