rcolebaugh / rpms / bash

Forked from rpms/bash a year ago
Clone
07a490
			     BASH PATCH REPORT
07a490
			     =================
07a490
07a490
Bash-Release:	4.2
07a490
Patch-ID:	bash42-008
07a490
07a490
Bug-Reported-by:	Doug McMahon <mc2man@optonline.net>
07a490
Bug-Reference-ID:	<1299441211.2535.11.camel@doug-XPS-M1330>
07a490
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00050.html
07a490
07a490
Bug-Description:
07a490
07a490
Bash-4.2 does not attempt to save the shell history on receipt of a
07a490
terminating signal that is handled synchronously.  Unfortunately, the
07a490
`close' button on most X11 terminal emulators sends SIGHUP, which
07a490
kills the shell.
07a490
07a490
This is a very small patch to save the history in the case that an
07a490
interactive shell receives a SIGHUP or SIGTERM while in readline and
07a490
reading a command.
07a490
07a490
The next version of bash will do this differently.
07a490
07a490
Patch (apply with `patch -p0'):
07a490
07a490
*** ../bash-4.2-patched/sig.c	Tue Nov 23 08:21:22 2010
07a490
--- sig.c	Tue Mar  8 21:28:32 2011
07a490
***************
07a490
*** 47,50 ****
07a490
--- 47,51 ----
07a490
  #if defined (READLINE)
07a490
  #  include "bashline.h"
07a490
+ #  include <readline/readline.h>
07a490
  #endif
07a490
  
07a490
***************
07a490
*** 63,66 ****
07a490
--- 64,68 ----
07a490
  extern int history_lines_this_session;
07a490
  #endif
07a490
+ extern int no_line_editing;
07a490
  
07a490
  extern void initialize_siglist ();
07a490
***************
07a490
*** 506,510 ****
07a490
  #if defined (HISTORY)
07a490
        /* XXX - will inhibit history file being written */
07a490
!       history_lines_this_session = 0;
07a490
  #endif
07a490
        terminate_immediately = 0;
07a490
--- 508,515 ----
07a490
  #if defined (HISTORY)
07a490
        /* XXX - will inhibit history file being written */
07a490
! #  if defined (READLINE)
07a490
!       if (interactive_shell == 0 || interactive == 0 || (sig != SIGHUP && sig != SIGTERM) || no_line_editing || (RL_ISSTATE (RL_STATE_READCMD) == 0))
07a490
! #  endif
07a490
!         history_lines_this_session = 0;
07a490
  #endif
07a490
        terminate_immediately = 0;
07a490
*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
07a490
--- patchlevel.h	Thu Feb 24 21:41:34 2011
07a490
***************
07a490
*** 26,30 ****
07a490
     looks for to find the patch level (for the sccs version string). */
07a490
  
07a490
! #define PATCHLEVEL 7
07a490
  
07a490
  #endif /* _PATCHLEVEL_H_ */
07a490
--- 26,30 ----
07a490
     looks for to find the patch level (for the sccs version string). */
07a490
  
07a490
! #define PATCHLEVEL 8
07a490
  
07a490
  #endif /* _PATCHLEVEL_H_ */