rcolebaugh / rpms / bash

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