diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2015-01-15 10:21:08 -0500 |
|---|---|---|
| committer | Dan Pasanen <dan.pasanen@gmail.com> | 2015-02-19 15:44:15 -0600 |
| commit | bbc8b4849e0921dc4d9742359ca37f527712eccd (patch) | |
| tree | a7073195c30ebb97866130352e0521fe6a4ccb7e /bashline.c | |
| parent | c6a8bcd4a5660e7d0bc4759f08a272c97bea369d (diff) | |
| download | android_external_bash-stable/cm-12.0-YNG4N.tar.gz android_external_bash-stable/cm-12.0-YNG4N.tar.bz2 android_external_bash-stable/cm-12.0-YNG4N.zip | |
Bash-4.3 patch 33stable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Cstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Ccm-12.1cm-12.0
Change-Id: Id50c454f86c5df0e6cab6226ab7e5cc1a9b37883
Diffstat (limited to 'bashline.c')
| -rw-r--r-- | bashline.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -202,6 +202,7 @@ extern int current_command_line_count, saved_command_line_count; extern int last_command_exit_value; extern int array_needs_making; extern int posixly_correct, no_symbolic_links; +extern int sigalrm_seen; extern char *current_prompt_string, *ps1_prompt; extern STRING_INT_ALIST word_token_alist[]; extern sh_builtin_func_t *last_shell_builtin, *this_shell_builtin; @@ -4208,8 +4209,9 @@ bash_event_hook () { /* If we're going to longjmp to top_level, make sure we clean up readline. check_signals will call QUIT, which will eventually longjmp to top_level, - calling run_interrupt_trap along the way. */ - if (interrupt_state) + calling run_interrupt_trap along the way. The check for sigalrm_seen is + to clean up the read builtin's state. */ + if (terminating_signal || interrupt_state || sigalrm_seen) rl_cleanup_after_signal (); bashline_reset_event_hook (); check_signals_and_traps (); /* XXX */ |