Changeset 5cd07a2

Timestamp:

Sep 3, 2007, 10:04:12 PM (17 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

37da1a9

Parents:

91e274a

Message:

Updated Bash 3.2 Patch to -6

Files:

• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/bash-3.2-fixes-6.patch (moved) (moved from patches/bash-3.2-fixes-5.patch ) (38 diffs)

BOOK/introduction/common/changelog.xml

@@ -76 +76 @@
           buffer overflows, useradd -G fixes, better name support, and
           the previous useradd fix.</para>
+        </listitem>
+        <listitem>
+          <para>[jim] - Updated Bash 3.2 Patch to -6.</para>
         </listitem>
       </itemizedlist>

BOOK/patches.ent

@@ -5 +5 @@
 <!-- Start of Common Patches -->
 
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-5.patch">
-<!ENTITY bash-fixes-patch-md5 "e6dacf6efb8ae0b119d9b03dafb94760">
-<!ENTITY bash-fixes-patch-size "32 KB">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-6.patch">
+<!ENTITY bash-fixes-patch-md5 "ea529c1d125a1cfe13b20784821a0bc0">
+<!ENTITY bash-fixes-patch-size "56 KB">
 
 <!ENTITY binutils-posix-patch "binutils-&binutils-version;-posix-1.patch">

patches/bash-3.2-fixes-6.patch

@@ -1 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2007-07-23
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2007-09-04
 Initial Package Version: 3.2
 Origin: ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/
 Upstream Status: From Upstream
-Description: Contains patches 001-017 from upstream
+Description: Contains patches 001-025 from upstream
 
 diff -Naur bash-3.2.orig/array.c bash-3.2/array.c
---- bash-3.2.orig/array.c       2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/array.c    2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/array.c       2005-06-01 13:39:22.000000000 -0700
++++ bash-3.2/array.c    2007-09-03 21:59:25.000000000 -0700
 @@ -120,7 +120,6 @@
         return(a1);
@@ -106 +106 @@
                 sifs[0] = ifs ? *ifs : '\0';
 diff -Naur bash-3.2.orig/array.h bash-3.2/array.h
---- bash-3.2.orig/array.h       2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/array.h    2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/array.h       2003-06-01 12:50:30.000000000 -0700
++++ bash-3.2/array.h    2007-09-03 21:59:25.000000000 -0700
 @@ -55,6 +55,7 @@
  extern ARRAY_ELEMENT *array_unshift_element __P((ARRAY *));
@@ -116 +116 @@
  extern char    *array_subrange __P((ARRAY *, arrayind_t, arrayind_t, int, int));
  extern char    *array_patsub __P((ARRAY *, char *, char *, int));
+diff -Naur bash-3.2.orig/arrayfunc.c bash-3.2/arrayfunc.c
+--- bash-3.2.orig/arrayfunc.c   2006-07-27 06:37:59.000000000 -0700
++++ bash-3.2/arrayfunc.c        2007-09-03 21:59:34.000000000 -0700
+@@ -618,6 +618,8 @@
+   if (expok == 0)
+     {
+       last_command_exit_value = EXECUTION_FAILURE;
++
++      top_level_cleanup ();      
+       jump_to_top_level (DISCARD);
+     }
+   return val;
 diff -Naur bash-3.2.orig/builtins/common.c bash-3.2/builtins/common.c
---- bash-3.2.orig/builtins/common.c     2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/builtins/common.c  2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/builtins/common.c     2006-07-27 06:39:51.000000000 -0700
++++ bash-3.2/builtins/common.c  2007-09-03 21:59:34.000000000 -0700
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
@@ -125 +137 @@
     This file is part of GNU Bash, the Bourne Again SHell.
  
-@@ -475,7 +475,11 @@
+@@ -131,6 +131,7 @@
+   if (list)
+     {
+       builtin_error (_("too many arguments"));
++      top_level_cleanup ();
+       jump_to_top_level (DISCARD);
+     }
+ }
+@@ -395,7 +396,10 @@
+          if (fatal)
+            throw_to_top_level ();
+          else
+-           jump_to_top_level (DISCARD);
++           {
++             top_level_cleanup ();
++             jump_to_top_level (DISCARD);
++           }
+        }
+       no_args (list->next);
+     }
+@@ -475,7 +479,11 @@
  
    if (the_current_working_directory == 0)
@@ -138 +170 @@
           fprintf (stderr, _("%s: error retrieving current directory: %s: %s\n"),
 diff -Naur bash-3.2.orig/builtins/printf.def bash-3.2/builtins/printf.def
---- bash-3.2.orig/builtins/printf.def   2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/builtins/printf.def        2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/builtins/printf.def   2006-09-18 05:48:42.000000000 -0700
++++ bash-3.2/builtins/printf.def        2007-09-03 21:59:23.000000000 -0700
 @@ -1,7 +1,7 @@
  This file is printf.def, from which is created printf.c.
@@ -184 +216 @@
  static int printstr __P((char *, char *, int, int, int));
  static int tescape __P((char *, char *, int *));
+diff -Naur bash-3.2.orig/builtins/read.def bash-3.2/builtins/read.def
+--- bash-3.2.orig/builtins/read.def     2006-09-19 05:45:48.000000000 -0700
++++ bash-3.2/builtins/read.def  2007-09-03 21:59:36.000000000 -0700
+@@ -127,14 +127,14 @@
+      WORD_LIST *list;
+ {
+   register char *varname;
+-  int size, i, nr, pass_next, saw_escape, eof, opt, retval, code;
+-  int input_is_tty, input_is_pipe, unbuffered_read;
++  int size, i, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2;
++  int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc, skip_ctlnul;
+   int raw, edit, nchars, silent, have_timeout, fd;
+   unsigned int tmout;
+   intmax_t intval;
+   char c;
+   char *input_string, *orig_input_string, *ifs_chars, *prompt, *arrayname;
+-  char *e, *t, *t1;
++  char *e, *t, *t1, *ps2;
+   struct stat tsb;
+   SHELL_VAR *var;
+ #if defined (ARRAY_VARS)
+@@ -148,6 +148,7 @@
+   USE_VAR(size);
+   USE_VAR(i);
+   USE_VAR(pass_next);
++  USE_VAR(print_ps2);
+   USE_VAR(saw_escape);
+   USE_VAR(input_is_pipe);
+ /*  USE_VAR(raw); */
+@@ -163,6 +164,7 @@
+   USE_VAR(rlind);
+ #endif
+   USE_VAR(list);
++  USE_VAR(ps2);
+ 
+   i = 0;               /* Index into the string that we are reading. */
+   raw = edit = 0;      /* Not reading raw input by default. */
+@@ -386,7 +388,8 @@
+   setmode (0, O_TEXT);
+ #endif
+ 
+-  for (eof = retval = 0;;)
++  ps2 = 0;
++  for (print_ps2 = eof = retval = 0;;)
+     {
+ #if defined (READLINE)
+       if (edit)
+@@ -412,6 +415,15 @@
+        {
+ #endif
+ 
++      if (print_ps2)
++       {
++         if (ps2 == 0)
++           ps2 = get_string_value ("PS2");
++         fprintf (stderr, "%s", ps2 ? ps2 : "");
++         fflush (stderr);
++         print_ps2 = 0;
++       }
++
+       if (unbuffered_read)
+        retval = zread (fd, &c, 1);
+       else
+@@ -440,7 +452,11 @@
+        {
+          pass_next = 0;
+          if (c == '\n')
+-           i--;                /* back up over the CTLESC */
++           {
++             i--;              /* back up over the CTLESC */
++             if (interactive && input_is_tty && raw == 0)
++               print_ps2 = 1;
++           }
+          else
+            goto add_char;
+          continue;
 diff -Naur bash-3.2.orig/config-bot.h bash-3.2/config-bot.h
---- bash-3.2.orig/config-bot.h  2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/config-bot.h       2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/config-bot.h  2006-09-12 13:43:04.000000000 -0700
++++ bash-3.2/config-bot.h       2007-09-03 21:59:22.000000000 -0700
 @@ -1,7 +1,7 @@
  /* config-bot.h */
@@ -212 +320 @@
  
 diff -Naur bash-3.2.orig/config.h.in bash-3.2/config.h.in
---- bash-3.2.orig/config.h.in   2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/config.h.in        2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/config.h.in   2006-09-12 13:00:54.000000000 -0700
++++ bash-3.2/config.h.in        2007-09-03 21:59:23.000000000 -0700
 @@ -1,6 +1,6 @@
  /* config.h -- Configuration file for bash. */
@@ -242 +350 @@
  
 diff -Naur bash-3.2.orig/configure bash-3.2/configure
---- bash-3.2.orig/configure     2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/configure  2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/configure     2006-09-26 08:06:01.000000000 -0700
++++ bash-3.2/configure  2007-09-03 21:59:22.000000000 -0700
 @@ -27316,7 +27316,8 @@
  sco3.2v4*)     LOCAL_CFLAGS="-DMUST_UNBLOCK_CHLD -DPATH_MAX=1024" ;;
@@ -255 +363 @@
                 case "`uname -r`" in
 diff -Naur bash-3.2.orig/configure.in bash-3.2/configure.in
---- bash-3.2.orig/configure.in  2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/configure.in       2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/configure.in  2006-09-26 08:05:45.000000000 -0700
++++ bash-3.2/configure.in       2007-09-03 21:59:22.000000000 -0700
 @@ -5,7 +5,7 @@
  dnl
@@ -277 +385 @@
                 case "`uname -r`" in
 diff -Naur bash-3.2.orig/execute_cmd.c bash-3.2/execute_cmd.c
---- bash-3.2.orig/execute_cmd.c 2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/execute_cmd.c      2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/execute_cmd.c 2006-08-25 21:23:17.000000000 -0700
++++ bash-3.2/execute_cmd.c      2007-09-03 21:59:26.000000000 -0700
 @@ -1,6 +1,6 @@
  /* execute_cmd.c -- Execute a COMMAND structure. */
@@ -308 +416 @@
                         pipe_in, pipe_out, async, fds_to_close,
                         simple_command->flags);
+diff -Naur bash-3.2.orig/expr.c bash-3.2/expr.c
+--- bash-3.2.orig/expr.c        2005-12-28 14:47:03.000000000 -0800
++++ bash-3.2/expr.c     2007-09-03 21:59:34.000000000 -0700
+@@ -929,6 +929,7 @@
+       if (interactive_shell)
+        {
+          expr_unwind ();
++         top_level_cleanup ();
+          jump_to_top_level (DISCARD);
+        }
+       else
 diff -Naur bash-3.2.orig/findcmd.c bash-3.2/findcmd.c
---- bash-3.2.orig/findcmd.c     2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/findcmd.c  2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/findcmd.c     2005-08-17 13:49:54.000000000 -0700
++++ bash-3.2/findcmd.c  2007-09-03 21:59:18.000000000 -0700
 @@ -308,7 +308,7 @@
    if (hashed_file && (posixly_correct || check_hashed_filenames))
@@ -321 +440 @@
           free (hashed_file);
 diff -Naur bash-3.2.orig/jobs.c bash-3.2/jobs.c
---- bash-3.2.orig/jobs.c        2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/jobs.c     2007-07-23 19:58:47.000000000 -0400
-@@ -984,8 +984,6 @@
+--- bash-3.2.orig/jobs.c        2006-07-29 13:40:48.000000000 -0700
++++ bash-3.2/jobs.c     2007-09-03 21:59:30.000000000 -0700
+@@ -783,11 +783,13 @@
+   if (jobs[js.j_firstj] == 0)
+     {
+       old = js.j_firstj++;
++      if (old >= js.j_jobslots)
++       old = js.j_jobslots - 1;
+       while (js.j_firstj != old)
+        {
+          if (js.j_firstj >= js.j_jobslots)
+            js.j_firstj = 0;
+-         if (jobs[js.j_firstj])
++         if (jobs[js.j_firstj] || js.j_firstj == old)  /* needed if old == 0 */
+            break;
+          js.j_firstj++;
+        }
+@@ -797,11 +799,13 @@
+   if (jobs[js.j_lastj] == 0)
+     {
+       old = js.j_lastj--;
++      if (old < 0)
++       old = 0;
+       while (js.j_lastj != old)
+        {
+          if (js.j_lastj < 0)
+            js.j_lastj = js.j_jobslots - 1;
+-         if (jobs[js.j_lastj])
++         if (jobs[js.j_lastj] || js.j_lastj == old)    /* needed if old == js.j_jobslots */
+            break;
+          js.j_lastj--;
+        }
+@@ -963,7 +967,11 @@
+   reap_dead_jobs ();
+   realloc_jobs_list ();
+ 
+-  return (js.j_lastj);
++#ifdef DEBUG
++  itrace("compact_jobs_list: returning %d", (js.j_lastj || jobs[js.j_lastj]) ? js.j_lastj + 1 : 0);
++#endif
++
++  return ((js.j_lastj || jobs[js.j_lastj]) ? js.j_lastj + 1 : 0);
+ }
+ 
+ /* Delete the job at INDEX from the job list.  Must be called
+@@ -984,8 +992,6 @@
    temp = jobs[job_index];
    if (temp == 0)
@@ -332 +494 @@
    if ((dflags & DEL_NOBGPID) == 0)
      {
-@@ -1028,6 +1026,9 @@
+@@ -1028,6 +1034,9 @@
      js.j_firstj = js.j_lastj = 0;
    else if (jobs[js.j_firstj] == 0 || jobs[js.j_lastj] == 0)
@@ -342 +504 @@
  
  /* Must be called with SIGCHLD blocked. */
+diff -Naur bash-3.2.orig/lib/readline/complete.c bash-3.2/lib/readline/complete.c
+--- bash-3.2.orig/lib/readline/complete.c       2006-07-28 08:35:49.000000000 -0700
++++ bash-3.2/lib/readline/complete.c    2007-09-03 21:59:32.000000000 -0700
+@@ -428,7 +428,7 @@
+        return (1);
+       if (c == 'n' || c == 'N' || c == RUBOUT)
+        return (0);
+-      if (c == ABORT_CHAR)
++      if (c == ABORT_CHAR || c < 0)
+        _rl_abort_internal ();
+       if (for_pager && (c == NEWLINE || c == RETURN))
+        return (2);
 diff -Naur bash-3.2.orig/lib/readline/display.c bash-3.2/lib/readline/display.c
---- bash-3.2.orig/lib/readline/display.c        2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/lib/readline/display.c     2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/lib/readline/display.c        2006-09-14 11:20:12.000000000 -0700
++++ bash-3.2/lib/readline/display.c     2007-09-03 21:59:40.000000000 -0700
 @@ -561,6 +561,17 @@
        wrap_offset = prompt_invis_chars_first_line = 0;
@@ -371 +545 @@
  #if defined (HANDLE_MULTIBYTE)   
  #define CHECK_LPOS() \
-@@ -1586,8 +1598,22 @@
+@@ -1506,11 +1518,31 @@
+     {
+       /* Non-zero if we're increasing the number of lines. */
+       int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
++      /* If col_lendiff is > 0, implying that the new string takes up more
++        screen real estate than the old, but lendiff is < 0, meaning that it
++        takes fewer bytes, we need to just output the characters starting
++        from the first difference.  These will overwrite what is on the
++        display, so there's no reason to do a smart update.  This can really
++        only happen in a multibyte environment. */
++      if (lendiff < 0)
++       {
++         _rl_output_some_chars (nfd, temp);
++         _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
++         /* If nfd begins before any invisible characters in the prompt,
++            adjust _rl_last_c_pos to account for wrap_offset and set
++            cpos_adjusted to let the caller know. */
++         if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
++           {
++             _rl_last_c_pos -= wrap_offset;
++             cpos_adjusted = 1;
++           }
++         return;
++       }
+       /* Sometimes it is cheaper to print the characters rather than
+         use the terminal's capabilities.  If we're growing the number
+         of lines, make sure we actually cause the new line to wrap
+         around on auto-wrapping terminals. */
+-      if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
++      else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
+        {
+          /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
+             _rl_horizontal_scroll_mode == 1, inserting the characters with
+@@ -1586,8 +1618,22 @@
           temp = nls - nfd;
           if (temp > 0)
@@ -395 +602 @@
         }
        /* Otherwise, print over the existing material. */
-@@ -1595,8 +1621,20 @@
+@@ -1595,8 +1641,20 @@
         {
           if (temp > 0)
@@ -416 +623 @@
           lendiff = (oe - old) - (ne - new);
           if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-@@ -1732,7 +1770,10 @@
+@@ -1732,7 +1790,10 @@
    if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
      {
@@ -428 +635 @@
           dpos -= woff;
           /* Since this will be assigned to _rl_last_c_pos at the end (more
-@@ -2380,6 +2421,8 @@
+@@ -2380,6 +2441,8 @@
  
    if (end <= start)
@@ -437 +644 @@
    memset (&ps, 0, sizeof (mbstate_t));
  
+diff -Naur bash-3.2.orig/lib/readline/input.c bash-3.2/lib/readline/input.c
+--- bash-3.2.orig/lib/readline/input.c  2006-08-16 12:15:16.000000000 -0700
++++ bash-3.2/lib/readline/input.c       2007-09-03 21:59:42.000000000 -0700
+@@ -133,8 +133,11 @@
+     return (0);
+ 
+   *key = ibuffer[pop_index++];
+-
++#if 0
+   if (pop_index >= ibuffer_len)
++#else
++  if (pop_index > ibuffer_len)
++#endif
+     pop_index = 0;
+ 
+   return (1);
+@@ -250,7 +253,8 @@
+       while (chars_avail--)
+        {
+          k = (*rl_getc_function) (rl_instream);
+-         rl_stuff_char (k);
++         if (rl_stuff_char (k) == 0)
++           break;                      /* some problem; no more room */
+          if (k == NEWLINE || k == RETURN)
+            break;
+        }
+@@ -373,7 +377,11 @@
+       RL_SETSTATE (RL_STATE_INPUTPENDING);
+     }
+   ibuffer[push_index++] = key;
++#if 0
+   if (push_index >= ibuffer_len)
++#else
++  if (push_index > ibuffer_len)
++#endif
+     push_index = 0;
+ 
+   return 1;
+@@ -513,20 +521,26 @@
+      char *mbchar;
+      int size;
+ {
+-  int mb_len = 0;
++  int mb_len, c;
+   size_t mbchar_bytes_length;
+   wchar_t wc;
+   mbstate_t ps, ps_back;
+ 
+   memset(&ps, 0, sizeof (mbstate_t));
+   memset(&ps_back, 0, sizeof (mbstate_t));
+-  
++
++  mb_len = 0;  
+   while (mb_len < size)
+     {
+       RL_SETSTATE(RL_STATE_MOREINPUT);
+-      mbchar[mb_len++] = rl_read_key ();
++      c = rl_read_key ();
+       RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ 
++      if (c < 0)
++       break;
++
++      mbchar[mb_len++] = c;
++
+       mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
+       if (mbchar_bytes_length == (size_t)(-1))
+        break;          /* invalid byte sequence for the current locale */
+@@ -564,7 +578,7 @@
+ 
+   c = first;
+   memset (mb, 0, mlen);
+-  for (i = 0; i < mlen; i++)
++  for (i = 0; c >= 0 && i < mlen; i++)
+     {
+       mb[i] = (char)c;
+       memset (&ps, 0, sizeof (mbstate_t));
+diff -Naur bash-3.2.orig/lib/readline/isearch.c bash-3.2/lib/readline/isearch.c
+--- bash-3.2.orig/lib/readline/isearch.c        2005-12-26 14:18:53.000000000 -0800
++++ bash-3.2/lib/readline/isearch.c     2007-09-03 21:59:32.000000000 -0700
+@@ -327,8 +327,15 @@
+   rl_command_func_t *f;
+ 
+   f = (rl_command_func_t *)NULL;
+- 
+- /* Translate the keys we do something with to opcodes. */
++
++  if (c < 0)
++    {
++      cxt->sflags |= SF_FAILED;
++      cxt->history_pos = cxt->last_found_line;
++      return -1;
++    }
++
++  /* Translate the keys we do something with to opcodes. */
+   if (c >= 0 && _rl_keymap[c].type == ISFUNC)
+     {
+       f = _rl_keymap[c].function;
+diff -Naur bash-3.2.orig/lib/readline/misc.c bash-3.2/lib/readline/misc.c
+--- bash-3.2.orig/lib/readline/misc.c   2005-12-26 14:20:46.000000000 -0800
++++ bash-3.2/lib/readline/misc.c        2007-09-03 21:59:32.000000000 -0700
+@@ -146,6 +146,8 @@
+          rl_restore_prompt ();
+          rl_clear_message ();
+          RL_UNSETSTATE(RL_STATE_NUMERICARG);
++         if (key < 0)
++           return -1;
+          return (_rl_dispatch (key, _rl_keymap));
+        }
+     }
+diff -Naur bash-3.2.orig/lib/readline/readline.c bash-3.2/lib/readline/readline.c
+--- bash-3.2.orig/lib/readline/readline.c       2006-08-16 12:00:36.000000000 -0700
++++ bash-3.2/lib/readline/readline.c    2007-09-03 21:59:32.000000000 -0700
+@@ -645,6 +645,11 @@
+   if ((cxt->flags & KSEQ_DISPATCHED) == 0)
+     {
+       nkey = _rl_subseq_getchar (cxt->okey);
++      if (nkey < 0)
++       {
++         _rl_abort_internal ();
++         return -1;
++       }
+       r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg);
+       cxt->flags |= KSEQ_DISPATCHED;
+     }
+diff -Naur bash-3.2.orig/lib/readline/text.c bash-3.2/lib/readline/text.c
+--- bash-3.2.orig/lib/readline/text.c   2006-07-28 08:55:27.000000000 -0700
++++ bash-3.2/lib/readline/text.c        2007-09-03 21:59:32.000000000 -0700
+@@ -857,6 +857,9 @@
+   c = rl_read_key ();
+   RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ 
++  if (c < 0)
++    return -1;
++
+ #if defined (HANDLE_SIGNALS)
+   if (RL_ISSTATE (RL_STATE_CALLBACK) == 0)
+     _rl_restore_tty_signals ();
+@@ -1520,6 +1523,9 @@
+ 
+   mb_len = _rl_read_mbchar (mbchar, MB_LEN_MAX);
+ 
++  if (mb_len <= 0)
++    return -1;
++
+   if (count < 0)
+     return (_rl_char_search_internal (-count, bdir, mbchar, mb_len));
+   else
+@@ -1536,6 +1542,9 @@
+   c = rl_read_key ();
+   RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ 
++  if (c < 0)
++    return -1;
++
+   if (count < 0)
+     return (_rl_char_search_internal (-count, bdir, c));
+   else
+diff -Naur bash-3.2.orig/lib/readline/vi_mode.c bash-3.2/lib/readline/vi_mode.c
+--- bash-3.2.orig/lib/readline/vi_mode.c        2006-07-29 13:42:28.000000000 -0700
++++ bash-3.2/lib/readline/vi_mode.c     2007-09-03 21:59:32.000000000 -0700
+@@ -886,6 +886,13 @@
+   RL_SETSTATE(RL_STATE_MOREINPUT);
+   c = rl_read_key ();
+   RL_UNSETSTATE(RL_STATE_MOREINPUT);
++
++  if (c < 0)
++    {
++      *nextkey = 0;
++      return -1;
++    }
++
+   *nextkey = c;
+ 
+   if (!member (c, vi_motion))
+@@ -902,6 +909,11 @@
+          RL_SETSTATE(RL_STATE_MOREINPUT);
+          c = rl_read_key ();   /* real command */
+          RL_UNSETSTATE(RL_STATE_MOREINPUT);
++         if (c < 0)
++           {
++             *nextkey = 0;
++             return -1;
++           }
+          *nextkey = c;
+        }
+       else if (key == c && (key == 'd' || key == 'y' || key == 'c'))
+@@ -1224,14 +1236,22 @@
+ _rl_vi_callback_char_search (data)
+      _rl_callback_generic_arg *data;
+ {
++  int c;
+ #if defined (HANDLE_MULTIBYTE)
+-  _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
++  c = _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
+ #else
+   RL_SETSTATE(RL_STATE_MOREINPUT);
+-  _rl_vi_last_search_char = rl_read_key ();
++  c = rl_read_key ();
+   RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ #endif
+ 
++  if (c <= 0)
++    return -1;
++
++#if !defined (HANDLE_MULTIBYTE)
++  _rl_vi_last_search_char = c;
++#endif
++
+   _rl_callback_func = 0;
+   _rl_want_redisplay = 1;
+ 
+@@ -1247,6 +1267,7 @@
+ rl_vi_char_search (count, key)
+      int count, key;
+ {
++  int c;
+ #if defined (HANDLE_MULTIBYTE)
+   static char *target;
+   static int tlen;
+@@ -1293,11 +1314,17 @@
+       else
+        {
+ #if defined (HANDLE_MULTIBYTE)
+-         _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
++         c = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
++         if (c <= 0)
++           return -1;
++         _rl_vi_last_search_mblen = c;
+ #else
+          RL_SETSTATE(RL_STATE_MOREINPUT);
+-         _rl_vi_last_search_char = rl_read_key ();
++         c = rl_read_key ();
+          RL_UNSETSTATE(RL_STATE_MOREINPUT);
++         if (c < 0)
++           return -1;
++         _rl_vi_last_search_char = c;
+ #endif
+        }
+     }
+@@ -1467,6 +1494,9 @@
+   c = rl_read_key ();
+   RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ 
++  if (c < 0)
++    return -1;
++
+ #if defined (HANDLE_MULTIBYTE)
+   if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+     c = _rl_read_mbstring (c, mb, mlen);
+@@ -1485,6 +1515,9 @@
+ 
+   _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
+ 
++  if (c < 0)
++    return -1;
++
+   _rl_callback_func = 0;
+   _rl_want_redisplay = 1;
+ 
+@@ -1516,6 +1549,9 @@
+   else
+     _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
+ 
++  if (c < 0)
++    return -1;
++
+   return (_rl_vi_change_char (count, c, mb));
+ }
+ 
+@@ -1650,7 +1686,7 @@
+   ch = rl_read_key ();
+   RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ 
+-  if (ch < 'a' || ch > 'z')
++  if (ch < 0 || ch < 'a' || ch > 'z')  /* make test against 0 explicit */
+     {
+       rl_ding ();
+       return -1;
+@@ -1702,7 +1738,7 @@
+       rl_point = rl_mark;
+       return 0;
+     }
+-  else if (ch < 'a' || ch > 'z')
++  else if (ch < 0 || ch < 'a' || ch > 'z')     /* make test against 0 explicit */
+     {
+       rl_ding ();
+       return -1;
 diff -Naur bash-3.2.orig/lib/sh/snprintf.c bash-3.2/lib/sh/snprintf.c
---- bash-3.2.orig/lib/sh/snprintf.c     2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/lib/sh/snprintf.c  2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/lib/sh/snprintf.c     2006-04-06 06:48:40.000000000 -0700
++++ bash-3.2/lib/sh/snprintf.c  2007-09-03 21:59:19.000000000 -0700
 @@ -471,6 +471,8 @@
           10^x ~= r
@@ -567 +1062 @@
                  * is in the range or [-4,p] exclusively
 diff -Naur bash-3.2.orig/parse.y bash-3.2/parse.y
---- bash-3.2.orig/parse.y       2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/parse.y    2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/parse.y       2006-09-19 13:37:21.000000000 -0700
++++ bash-3.2/parse.y    2007-09-03 21:59:35.000000000 -0700
 @@ -1029,6 +1029,7 @@
  #define PST_CMDTOKEN   0x1000          /* command token OK - unused */
@@ -626 +1121 @@
         {
           tright = make_cond_node (COND_TERM, yylval.word, (COND_COM *)NULL, (COND_COM *)NULL);
+@@ -3367,7 +3376,7 @@
+       if (pass_next_character)
+        {
+          pass_next_character = 0;
+-         goto got_character;
++         goto got_escaped_character;
+        }
+ 
+       cd = current_delimiter (dstack);
 @@ -3419,9 +3428,34 @@
           goto next_character;
@@ -662 +1166 @@
           peek_char = shell_getc (1);
           if MBTEST(peek_char == '(')           /* ) */
+@@ -3616,12 +3650,14 @@
+ 
+     got_character:
+ 
+-      all_digit_token &= DIGIT (character);
+-      dollar_present |= character == '$';
+-
+       if (character == CTLESC || character == CTLNUL)
+        token[token_index++] = CTLESC;
+ 
++    got_escaped_character:
++
++      all_digit_token &= DIGIT (character);
++      dollar_present |= character == '$';
++
+       token[token_index++] = character;
+ 
+       RESIZE_MALLOCED_BUFFER (token, token_index, 1, token_buffer_size,
 diff -Naur bash-3.2.orig/patchlevel.h bash-3.2/patchlevel.h
---- bash-3.2.orig/patchlevel.h  2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/patchlevel.h       2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/patchlevel.h  2006-04-13 05:31:04.000000000 -0700
++++ bash-3.2/patchlevel.h       2007-09-03 21:59:42.000000000 -0700
 @@ -25,6 +25,6 @@
     regexp `^#define[   ]*PATCHLEVEL', since that's what support/mkversion.sh
@@ -670 +1192 @@
  
 -#define PATCHLEVEL 0
-+#define PATCHLEVEL 17
++#define PATCHLEVEL 25
  
  #endif /* _PATCHLEVEL_H_ */
 diff -Naur bash-3.2.orig/pathexp.c bash-3.2/pathexp.c
---- bash-3.2.orig/pathexp.c     2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/pathexp.c  2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/pathexp.c     2002-05-06 10:43:05.000000000 -0700
++++ bash-3.2/pathexp.c  2007-09-03 21:59:21.000000000 -0700
 @@ -1,6 +1,6 @@
  /* pathexp.c -- The shell interface to the globbing library. */
@@ -728 +1250 @@
           if (pathname[i] == '\0')
 diff -Naur bash-3.2.orig/pathexp.h bash-3.2/pathexp.h
---- bash-3.2.orig/pathexp.h     2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/pathexp.h  2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/pathexp.h     2005-02-19 14:23:18.000000000 -0800
++++ bash-3.2/pathexp.h  2007-09-03 21:59:21.000000000 -0700
 @@ -1,6 +1,6 @@
  /* pathexp.h -- The shell interface to the globbing library. */
@@ -747 +1269 @@
  /* Flags to OR with other flag args to strmatch() to enabled the extended
 diff -Naur bash-3.2.orig/po/ru.po bash-3.2/po/ru.po
---- bash-3.2.orig/po/ru.po      2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/po/ru.po   2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/po/ru.po      2006-01-10 14:51:03.000000000 -0800
++++ bash-3.2/po/ru.po   2007-09-03 21:59:10.000000000 -0700
 @@ -12,7 +12,7 @@
  "Last-Translator: Evgeniy Dushistov <dushistov@mail.ru>\n"
@@ -758 +1280 @@
  "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
  
+diff -Naur bash-3.2.orig/sig.c bash-3.2/sig.c
+--- bash-3.2.orig/sig.c 2006-01-25 11:57:59.000000000 -0800
++++ bash-3.2/sig.c      2007-09-03 21:59:34.000000000 -0700
+@@ -350,6 +350,25 @@
+ #undef XSIG
+ #undef XHANDLER
+ 
++/* Run some of the cleanups that should be performed when we run
++   jump_to_top_level from a builtin command context.  XXX - might want to
++   also call reset_parser here. */
++void
++top_level_cleanup ()
++{
++  /* Clean up string parser environment. */
++  while (parse_and_execute_level)
++    parse_and_execute_cleanup ();
++
++#if defined (PROCESS_SUBSTITUTION)
++  unlink_fifo_list ();
++#endif /* PROCESS_SUBSTITUTION */
++
++  run_unwind_protects ();
++  loop_level = continuing = breaking = 0;
++  return_catch_flag = 0;
++}
++
+ /* What to do when we've been interrupted, and it is safe to handle it. */
+ void
+ throw_to_top_level ()
+diff -Naur bash-3.2.orig/sig.h bash-3.2/sig.h
+--- bash-3.2.orig/sig.h 2006-01-25 11:50:27.000000000 -0800
++++ bash-3.2/sig.h      2007-09-03 21:59:34.000000000 -0700
+@@ -121,6 +121,7 @@
+ extern void initialize_signals __P((int));
+ extern void initialize_terminating_signals __P((void));
+ extern void reset_terminating_signals __P((void));
++extern void top_level_cleanup __P((void));
+ extern void throw_to_top_level __P((void));
+ extern void jump_to_top_level __P((int)) __attribute__((__noreturn__));
+ 
 diff -Naur bash-3.2.orig/subst.c bash-3.2/subst.c
---- bash-3.2.orig/subst.c       2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/subst.c    2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/subst.c       2006-09-19 05:35:09.000000000 -0700
++++ bash-3.2/subst.c    2007-09-03 21:59:37.000000000 -0700
 @@ -4,7 +4,7 @@
  /* ``Have a little faith, there's magic in the night.  You ain't a
@@ -770 +1332 @@
     This file is part of GNU Bash, the Bourne Again SHell.
  
+@@ -1278,7 +1278,7 @@
+     {
+       if (no_longjmp_on_fatal_error == 0)
+        {                       /* { */
+-         report_error ("bad substitution: no closing `%s' in %s", "}", string);
++         report_error (_("bad substitution: no closing `%s' in %s"), "}", string);
+          last_command_exit_value = EXECUTION_FAILURE;
+          exp_jump_to_top_level (DISCARD);
+        }
 @@ -1887,7 +1887,13 @@
    sep[1] = '\0';
@@ -877 +1448 @@
           s++;
           if (*s == '\0')
-@@ -4123,6 +4143,12 @@
+@@ -3954,7 +3974,11 @@
+   if (patspec == RP_LONG_LEFT || patspec == RP_LONG_RIGHT)
+     patstr++;
+ 
+-  pattern = getpattern (patstr, quoted, 1);
++  /* Need to pass getpattern newly-allocated memory in case of expansion --
++     the expansion code will free the passed string on an error. */
++  temp1 = savestring (patstr);
++  pattern = getpattern (temp1, quoted, 1);
++  free (temp1);
+ 
+   temp1 = (char *)NULL;                /* shut up gcc */
+   switch (vtype)
+@@ -4123,6 +4147,12 @@
      nfifo = 0;
  }
@@ -890 +1474 @@
  make_named_pipe ()
  {
-@@ -4172,6 +4198,12 @@
+@@ -4172,6 +4202,12 @@
    nfds++;
  }
@@ -903 +1487 @@
  unlink_fifo_list ()
  {
-@@ -4456,7 +4488,15 @@
+@@ -4456,7 +4492,15 @@
        /* Add the character to ISTRING, possibly after resizing it. */
        RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE);
@@ -920 +1504 @@
  
        istring[istring_index++] = c;
-@@ -4665,6 +4705,9 @@
+@@ -4665,6 +4709,9 @@
  
        last_command_exit_value = rc;
@@ -930 +1514 @@
      }
    else
-@@ -5546,12 +5589,16 @@
+@@ -5546,12 +5593,16 @@
          so verify_substring_values just returns the numbers specified and we
          rely on array_subrange to understand how to deal with them). */
@@ -947 +1531 @@
        break;
  #endif
-@@ -5707,6 +5754,11 @@
+@@ -5707,6 +5758,11 @@
    vtype &= ~VT_STARSUB;
  
@@ -959 +1543 @@
    /* Malloc this because expand_string_if_necessary or one of the expansion
       functions in its call chain may free it on a substitution error. */
-@@ -5741,13 +5793,12 @@
+@@ -5741,13 +5797,12 @@
      }
  
@@ -978 +1562 @@
      {
        mflags |= MATCH_BEG;
-@@ -5798,12 +5849,16 @@
+@@ -5798,12 +5853,16 @@
  #if defined (ARRAY_VARS)
      case VT_ARRAYVAR:
@@ -995 +1579 @@
  #endif
      }
+@@ -7607,6 +7666,8 @@
+   expand_no_split_dollar_star = 0;     /* XXX */
+   expanding_redir = 0;
+ 
++  top_level_cleanup ();                        /* from sig.c */
++
+   jump_to_top_level (v);
+ }
+ 
+@@ -7824,7 +7885,7 @@
+          else if (fail_glob_expansion != 0)
+            {
+              report_error (_("no match: %s"), tlist->word->word);
+-             jump_to_top_level (DISCARD);
++             exp_jump_to_top_level (DISCARD);
+            }
+          else if (allow_null_glob_expansion == 0)
+            {
 diff -Naur bash-3.2.orig/subst.h bash-3.2/subst.h
---- bash-3.2.orig/subst.h       2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/subst.h    2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/subst.h       2006-09-19 05:34:41.000000000 -0700
++++ bash-3.2/subst.h    2007-09-03 21:59:26.000000000 -0700
 @@ -222,6 +222,7 @@
  extern char *command_substitute __P((char *, int));
@@ -1007 +1609 @@
  extern WORD_LIST *list_string_with_quotes __P((char *));
 diff -Naur bash-3.2.orig/tests/new-exp.right bash-3.2/tests/new-exp.right
---- bash-3.2.orig/tests/new-exp.right   2007-07-23 19:54:02.000000000 -0400
-+++ bash-3.2/tests/new-exp.right        2007-07-23 19:58:47.000000000 -0400
+--- bash-3.2.orig/tests/new-exp.right   2006-08-10 09:00:00.000000000 -0700
++++ bash-3.2/tests/new-exp.right        2007-09-03 21:59:12.000000000 -0700
 @@ -430,7 +430,7 @@
  Case06---1---A B C::---
@@ -1018 +1620 @@
  argv[2] = <b>
  argv[3] = <c>
+diff -Naur bash-3.2.orig/variables.c bash-3.2/variables.c
+--- bash-3.2.orig/variables.c   2006-09-08 10:33:32.000000000 -0700
++++ bash-3.2/variables.c        2007-09-03 21:59:34.000000000 -0700
+@@ -1821,11 +1821,17 @@
+          oval = value_cell (var);
+          lval = evalexp (oval, &expok);        /* ksh93 seems to do this */
+          if (expok == 0)
+-           jump_to_top_level (DISCARD);
++           {
++             top_level_cleanup ();
++             jump_to_top_level (DISCARD);
++           }
+        }
+       rval = evalexp (value, &expok);
+       if (expok == 0)
+-       jump_to_top_level (DISCARD);
++       {
++         top_level_cleanup ();
++         jump_to_top_level (DISCARD);
++       }
+       if (flags & ASS_APPEND)
+        rval += lval;
+       retval = itos (rval);