source: patches/bash-3.2-fixes-7.patch@ 0f9d1e9

array.c

@@ -120 +120 @@
         return(a1);
 }
 
-#ifdef INCLUDE_UNUSED
 /*
  * Make and return a new array composed of the elements in array A from
  * S to E, inclusive.
@@ -141 +140 @@
         for (p = s, i = 0; p != e; p = element_forw(p), i++) {
                 n = array_create_element (element_index(p), element_value(p));
                 ADD_BEFORE(a->head, n);
-                mi = element_index(ae);
+                mi = element_index(n);
         }
         a->num_elements = i;
         a->max_index = mi;
         return a;
 }
-#endif
 
 /*
  * Walk the array, calling FUNC once for each element, with the array
@@ -300 +298 @@
         return array;
 }
 
+ARRAY   *
+array_quote_escapes(array)
+ARRAY   *array;
+{
+        ARRAY_ELEMENT   *a;
+        char    *t;
+
+        if (array == 0 || array_head(array) == 0 || array_empty(array))
+                return (ARRAY *)NULL;
+        for (a = element_forw(array->head); a != array->head; a = element_forw(a)) {
+                t = quote_escapes (a->value);
+                FREE(a->value);
+                a->value = t;
+        }
+        return array;
+}
+
 /*
  * Return a string whose elements are the members of array A beginning at
  * index START and spanning NELEM members.  Null elements are counted.
@@ -311 +326 @@
 arrayind_t      start, nelem;
 int     starsub, quoted;
 {
+        ARRAY           *a2;
         ARRAY_ELEMENT   *h, *p;
         arrayind_t      i;
-        char            *ifs, sep[2];
+        char            *ifs, sep[2], *t;
 
         p = a ? array_head (a) : 0;
         if (p == 0 || array_empty (a) || start > array_max_index(a))
@@ -336 +352 @@
         for (i = 0, h = p; p != a->head && i < nelem; i++, p = element_forw(p))
                 ;
 
+        a2 = array_slice(a, h, p);
+
+        if (quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT))
+                array_quote(a2);
+        else
+                array_quote_escapes(a2);
+
         if (starsub && (quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT))) {
                 ifs = getifs();
                 sep[0] = ifs ? *ifs : '\0';
@@ -343 +366 @@
                 sep[0] = ' ';
         sep[1] = '\0';
 
-        return (array_to_string_internal (h, p, sep, quoted));
+        t = array_to_string (a2, sep, 0);
+        array_dispose(a2);
+
+        return t;
 }
 
 char *
@@ -367 +393 @@
         }
 
         if (mflags & MATCH_QUOTED)
-                array_quote (a2);
+                array_quote(a2);
+        else
+                array_quote_escapes(a2);
         if (mflags & MATCH_STARSUB) {
                 ifs = getifs();
                 sifs[0] = ifs ? *ifs : '\0';

array.h

@@ -55 +55 @@
 extern ARRAY_ELEMENT *array_unshift_element __P((ARRAY *));
 extern int      array_shift_element __P((ARRAY *, char *));
 extern ARRAY    *array_quote __P((ARRAY *));
+extern ARRAY    *array_quote_escapes __P((ARRAY *));
 
 extern char     *array_subrange __P((ARRAY *, arrayind_t, arrayind_t, int, int));
 extern char     *array_patsub __P((ARRAY *, char *, char *, int));

arrayfunc.c

@@ -618 +618 @@
   if (expok == 0)
     {
       last_command_exit_value = EXECUTION_FAILURE;
+
+      top_level_cleanup ();      
       jump_to_top_level (DISCARD);
     }
   return val;
@@ -720 +722 @@
   if (ALL_ELEMENT_SUB (t[0]) && t[1] == ']')
     {
       if (rtype)
-        *rtype = 1;
+        *rtype = (t[0] == '*') ? 1 : 2;
       if (allow_all == 0)
         {
           err_badarraysub (s);

builtins/common.c

@@ -1 @@
-/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2007 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -131 +131 @@
   if (list)
     {
       builtin_error (_("too many arguments"));
+      top_level_cleanup ();
       jump_to_top_level (DISCARD);
     }
 }
@@ -395 +396 @@
           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 +479 @@
 
   if (the_current_working_directory == 0)
     {
+#if defined (GETCWD_BROKEN)
+      the_current_working_directory = getcwd (0, PATH_MAX);
+#else
       the_current_working_directory = getcwd (0, 0);
+#endif
       if (the_current_working_directory == 0)
         {
           fprintf (stderr, _("%s: error retrieving current directory: %s: %s\n"),

builtins/printf.def

@@ -1 +1 @@
 This file is printf.def, from which is created printf.c.
 It implements the builtin "printf" in Bash.
 
-Copyright (C) 1997-2005 Free Software Foundation, Inc.
+Copyright (C) 1997-2007 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -49 +49 @@
 #  define INT_MIN               (-2147483647-1)
 #endif
 
+#if defined (PREFER_STDARG)
+#  include <stdarg.h>
+#else
+#  include <varargs.h>
+#endif
+
 #include <stdio.h>
 #include <chartypes.h>
 
@@ -64 +70 @@
 #include "bashgetopt.h"
 #include "common.h"
 
+#if defined (PRI_MACROS_BROKEN)
+#  undef PRIdMAX
+#endif
+
 #if !defined (PRIdMAX)
 #  if HAVE_LONG_LONG
 #    define PRIdMAX     "lld"
@@ -151 +161 @@
 #define SKIP1 "#'-+ 0"
 #define LENMODS "hjlLtz"
 
+#ifndef HAVE_ASPRINTF
+extern int asprintf __P((char **, const char *, ...)) __attribute__((__format__ (printf, 2, 3)));
+#endif
+
 static void printf_erange __P((char *));
 static int printstr __P((char *, char *, int, int, int));
 static int tescape __P((char *, char *, int *));

builtins/read.def

@@ -127 +127 @@
      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 +148 @@
   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 +164 @@
   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 +388 @@
   setmode (0, O_TEXT);
 #endif
 
-  for (eof = retval = 0;;)
+  ps2 = 0;
+  for (print_ps2 = eof = retval = 0;;)
     {
 #if defined (READLINE)
       if (edit)
@@ -412 +415 @@
         {
 #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 +452 @@
         {
           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;

config-bot.h

@@ -1 +1 @@
 /* config-bot.h */
 /* modify settings or make new ones based on what autoconf tells us. */
 
-/* Copyright (C) 1989-2002 Free Software Foundation, Inc.
+/* Copyright (C) 1989-2007 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -70 +70 @@
 #  define TERMIOS_MISSING
 #endif
 
-/* If we have a getcwd(3), but it calls popen(), #undef HAVE_GETCWD so
-   the replacement in getcwd.c will be built. */
-#if defined (HAVE_GETCWD) && defined (GETCWD_BROKEN)
+/* If we have a getcwd(3), but one that does not dynamically allocate memory,
+   #undef HAVE_GETCWD so the replacement in getcwd.c will be built.  We do
+   not do this on Solaris, because their implementation of loopback mounts
+   breaks the traditional file system assumptions that getcwd uses. */
+#if defined (HAVE_GETCWD) && defined (GETCWD_BROKEN) && !defined (SOLARIS)
 #  undef HAVE_GETCWD
 #endif
 

config.h.in

@@ -1 +1 @@
 /* config.h -- Configuration file for bash. */
 
-/* Copyright (C) 1987-2006 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2007 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -413 +413 @@
 
 #undef HAVE_DECL_STRTOLD
 
+#undef PRI_MACROS_BROKEN
+
 #undef STRTOLD_BROKEN
 
 /* Define if WCONTINUED is defined in system headers, but rejected by waitpid */
@@ -1006 +1008 @@
 /* Define if you have the `dcgettext' function. */
 #undef HAVE_DCGETTEXT
 
+/* Define if you have the `localeconv' function. */
+#undef HAVE_LOCALECONV
+
 /* Define if your system has a working `malloc' function. */
 /* #undef HAVE_MALLOC */
 

configure

@@ -4871 +4871 @@
                 # static version specified as -llibname to override the
                 # dynamic version
                 case "${host_os}" in
-                darwin8*)       READLINE_LIB='${READLINE_LIBRARY}' ;;
+                darwin[89]*)    READLINE_LIB='${READLINE_LIBRARY}' ;;
                 *)              READLINE_LIB=-lreadline ;;
                 esac
         fi
@@ -27316 +27316 @@
 sco3.2v4*)      LOCAL_CFLAGS="-DMUST_UNBLOCK_CHLD -DPATH_MAX=1024" ;;
 sco3.2*)        LOCAL_CFLAGS=-DMUST_UNBLOCK_CHLD ;;
 sunos4*)        LOCAL_CFLAGS=-DSunOS4 ;;
-solaris2.5*)    LOCAL_CFLAGS=-DSunOS5 ;;
+solaris2.5*)    LOCAL_CFLAGS="-DSunOS5 -DSOLARIS" ;;
+solaris2*)      LOCAL_CFLAGS=-DSOLARIS ;;
 lynxos*)        LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
 linux*)         LOCAL_LDFLAGS=-rdynamic          # allow dynamic loading
                 case "`uname -r`" in

configure.in

@@ -5 +5 @@
 dnl
 dnl Process this file with autoconf to produce a configure script.
 
-# Copyright (C) 1987-2006 Free Software Foundation, Inc.
+# Copyright (C) 1987-2007 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -518 +518 @@
                 # static version specified as -llibname to override the
                 # dynamic version
                 case "${host_os}" in
-                darwin8*)       READLINE_LIB='${READLINE_LIBRARY}' ;;
+                darwin[[89]]*)  READLINE_LIB='${READLINE_LIBRARY}' ;;
                 *)              READLINE_LIB=-lreadline ;;
                 esac
         fi
@@ -991 +991 @@
 sco3.2v4*)      LOCAL_CFLAGS="-DMUST_UNBLOCK_CHLD -DPATH_MAX=1024" ;;
 sco3.2*)        LOCAL_CFLAGS=-DMUST_UNBLOCK_CHLD ;;
 sunos4*)        LOCAL_CFLAGS=-DSunOS4 ;;
-solaris2.5*)    LOCAL_CFLAGS=-DSunOS5 ;;
+solaris2.5*)    LOCAL_CFLAGS="-DSunOS5 -DSOLARIS" ;;
+solaris2*)      LOCAL_CFLAGS=-DSOLARIS ;;
 lynxos*)        LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
 linux*)         LOCAL_LDFLAGS=-rdynamic          # allow dynamic loading
                 case "`uname -r`" in

execute_cmd.c

@@ -1 +1 @@
 /* execute_cmd.c -- Execute a COMMAND structure. */
 
-/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2007 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -614 +614 @@
       cleanup_redirects (redirection_undo_list);
       redirection_undo_list = (REDIRECT *)NULL;
       dispose_exec_redirects ();
-      return (EXECUTION_FAILURE);
+      return (last_command_exit_value = EXECUTION_FAILURE);
     }
 
   if (redirection_undo_list)
@@ -2546 +2546 @@
       arg1 = cond_expand_word (cond->left->op, 0);
       if (arg1 == 0)
         arg1 = nullstr;
-      arg2 = cond_expand_word (cond->right->op, patmatch||rmatch);
+      arg2 = cond_expand_word (cond->right->op, rmatch ? 2 : (patmatch ? 1 : 0));
       if (arg2 == 0)
         arg2 = nullstr;
 
@@ -3050 +3050 @@
   if (command_line == 0)
     command_line = savestring (the_printed_command_except_trap);
 
+#if defined (PROCESS_SUBSTITUTION)
+  if ((subshell_environment & SUBSHELL_COMSUB) && (simple_command->flags & CMD_NO_FORK) && fifos_pending() > 0)
+    simple_command->flags &= ~CMD_NO_FORK;
+#endif
+
   execute_disk_command (words, simple_command->redirects, command_line,
                         pipe_in, pipe_out, async, fds_to_close,
                         simple_command->flags);

bash-3.2

@@ -286 +286 @@
       free (expr_stack[expr_depth]);
     }
   free (expr_stack[expr_depth]);        /* free the allocated EXPR_CONTEXT */
+
+  noeval = 0;   /* XXX */
 }
 
 static void
@@ -319 +321 @@
   procenv_t oevalbuf;
 
   val = 0;
+  noeval = 0;
 
   FASTCOPY (evalbuf, oevalbuf, sizeof (evalbuf));
 
@@ -929 +932 @@
       if (interactive_shell)
         {
           expr_unwind ();
+          top_level_cleanup ();
           jump_to_top_level (DISCARD);
         }
       else

findcmd.c

@@ -308 +308 @@
   if (hashed_file && (posixly_correct || check_hashed_filenames))
     {
       st = file_status (hashed_file);
-      if ((st ^ (FS_EXISTS | FS_EXECABLE)) != 0)
+      if ((st & (FS_EXISTS|FS_EXECABLE)) != (FS_EXISTS|FS_EXECABLE))
         {
           phash_remove (pathname);
           free (hashed_file);

bash-3.2

@@ -783 +783 @@
   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 +799 @@
   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 +967 @@
   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 +992 @@
   temp = jobs[job_index];
   if (temp == 0)
     return;
-  if (job_index == js.j_current || job_index == js.j_previous)
-    reset_current ();
 
   if ((dflags & DEL_NOBGPID) == 0)
     {
@@ -1028 +1034 @@
     js.j_firstj = js.j_lastj = 0;
   else if (jobs[js.j_firstj] == 0 || jobs[js.j_lastj] == 0)
     reset_job_indices ();
+
+  if (job_index == js.j_current || job_index == js.j_previous)
+    reset_current ();
 }
 
 /* Must be called with SIGCHLD blocked. */

lib/readline/complete.c

@@ -428 +428 @@
         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);

lib/readline/display.c

@@ -391 +391 @@
       t = ++p;
       local_prompt = expand_prompt (p, &prompt_visible_length,
                                        &prompt_last_invisible,
-                                       (int *)NULL,
+                                       &prompt_invis_chars_first_line,
                                        &prompt_physical_chars);
       c = *t; *t = '\0';
       /* The portion of the prompt string up to and including the
          final newline is now null-terminated. */
       local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
                                                    (int *)NULL,
-                                                   &prompt_invis_chars_first_line,
+                                                   (int *)NULL,
                                                    (int *)NULL);
       *t = c;
       local_prompt_len = local_prompt ? strlen (local_prompt) : 0;
@@ -561 +561 @@
       wrap_offset = prompt_invis_chars_first_line = 0;
     }
 
+#if defined (HANDLE_MULTIBYTE)
+#define CHECK_INV_LBREAKS() \
+      do { \
+        if (newlines >= (inv_lbsize - 2)) \
+          { \
+            inv_lbsize *= 2; \
+            inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
+            _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \
+          } \
+      } while (0)
+#else
 #define CHECK_INV_LBREAKS() \
       do { \
         if (newlines >= (inv_lbsize - 2)) \
@@ -569 +580 @@
             inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
           } \
       } while (0)
+#endif /* HANDLE_MULTIBYTE */
 
 #if defined (HANDLE_MULTIBYTE)    
 #define CHECK_LPOS() \
@@ -1036 +1048 @@
                 tx = _rl_col_width (&visible_line[pos], 0, nleft) - visible_wrap_offset;
               else
                 tx = nleft;
-              if (_rl_last_c_pos > tx)
+              if (tx >= 0 && _rl_last_c_pos > tx)
                 {
                   _rl_backspace (_rl_last_c_pos - tx);  /* XXX */
                   _rl_last_c_pos = tx;
@@ -1192 +1204 @@
      int current_line, omax, nmax, inv_botlin;
 {
   register char *ofd, *ols, *oe, *nfd, *nls, *ne;
-  int temp, lendiff, wsatend, od, nd;
+  int temp, lendiff, wsatend, od, nd, o_cpos;
   int current_invis_chars;
   int col_lendiff, col_temp;
 #if defined (HANDLE_MULTIBYTE)
@@ -1453 +1465 @@
         _rl_last_c_pos = lendiff;
     }
 
+  o_cpos = _rl_last_c_pos;
+
   /* When this function returns, _rl_last_c_pos is correct, and an absolute
      cursor postion in multibyte mode, but a buffer index when not in a
      multibyte locale. */
@@ -1462 +1476 @@
   /* We need to indicate that the cursor position is correct in the presence of
      invisible characters in the prompt string.  Let's see if setting this when
      we make sure we're at the end of the drawn prompt string works. */
-  if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && _rl_last_c_pos == prompt_physical_chars)
+  if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && 
+      (_rl_last_c_pos > 0 || o_cpos > 0) &&
+      _rl_last_c_pos == prompt_physical_chars)
     cpos_adjusted = 1;
 #endif
 #endif
@@ -1506 +1522 @@
     {
       /* 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
@@ -1533 +1569 @@
             }
           else
             {
-              /* We have horizontal scrolling and we are not inserting at
-                 the end.  We have invisible characters in this line.  This
-                 is a dumb update. */
               _rl_output_some_chars (nfd, temp);
               _rl_last_c_pos += col_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;
             }
           /* Copy (new) chars to screen from first diff to last match. */
@@ -1586 +1627 @@
           temp = nls - nfd;
           if (temp > 0)
             {
+              /* If nfd begins at the prompt, or before the invisible
+                 characters in the prompt, we need to adjust _rl_last_c_pos
+                 in a multibyte locale to account for the wrap offset and
+                 set cpos_adjusted accordingly. */
               _rl_output_some_chars (nfd, temp);
-              _rl_last_c_pos += _rl_col_width (nfd, 0, temp);;
+              if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+                {
+                  _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
+                  if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
+                    {
+                      _rl_last_c_pos -= wrap_offset;
+                      cpos_adjusted = 1;
+                    }
+                }
+              else
+                _rl_last_c_pos += temp;
             }
         }
       /* Otherwise, print over the existing material. */
@@ -1595 +1650 @@
         {
           if (temp > 0)
             {
+              /* If nfd begins at the prompt, or before the invisible
+                 characters in the prompt, we need to adjust _rl_last_c_pos
+                 in a multibyte locale to account for the wrap offset and
+                 set cpos_adjusted accordingly. */
               _rl_output_some_chars (nfd, temp);
               _rl_last_c_pos += col_temp;               /* XXX */
+              if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+                {
+                  if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
+                    {
+                      _rl_last_c_pos -= wrap_offset;
+                      cpos_adjusted = 1;
+                    }
+                }
             }
           lendiff = (oe - old) - (ne - new);
           if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
@@ -1732 +1799 @@
   if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
     {
       dpos = _rl_col_width (data, 0, new);
-      if (dpos > prompt_last_invisible)         /* XXX - don't use woff here */
+      /* Use NEW when comparing against the last invisible character in the
+         prompt string, since they're both buffer indices and DPOS is a
+         desired display position. */
+      if (new > prompt_last_invisible)          /* XXX - don't use woff here */
         {
           dpos -= woff;
           /* Since this will be assigned to _rl_last_c_pos at the end (more
@@ -2380 +2450 @@
 
   if (end <= start)
     return 0;
+  if (MB_CUR_MAX == 1 || rl_byte_oriented)
+    return (end - start);
 
   memset (&ps, 0, sizeof (mbstate_t));
 

lib/readline/display.c.orig

@@ +1 @@
+/* display.c -- readline redisplay facility. */
+
+/* Copyright (C) 1987-2006 Free Software Foundation, Inc.
+
+   This file is part of the GNU Readline Library, a library for
+   reading lines of text with interactive input and history editing.
+
+   The GNU Readline Library is free software; you can redistribute it
+   and/or modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2, or
+   (at your option) any later version.
+
+   The GNU Readline Library is distributed in the hope that it will be
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   The GNU General Public License is often shipped with GNU software, and
+   is generally kept in a file called COPYING or LICENSE.  If you do not
+   have a copy of the license, write to the Free Software Foundation,
+   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#define READLINE_LIBRARY
+
+#if defined (HAVE_CONFIG_H)
+#  include <config.h>
+#endif
+
+#include <sys/types.h>
+
+#if defined (HAVE_UNISTD_H)
+#  include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+
+#include "posixstat.h"
+
+#if defined (HAVE_STDLIB_H)
+#  include <stdlib.h>
+#else
+#  include "ansi_stdlib.h"
+#endif /* HAVE_STDLIB_H */
+
+#include <stdio.h>
+
+/* System-specific feature definitions and include files. */
+#include "rldefs.h"
+#include "rlmbutil.h"
+
+/* Termcap library stuff. */
+#include "tcap.h"
+
+/* Some standard library routines. */
+#include "readline.h"
+#include "history.h"
+
+#include "rlprivate.h"
+#include "xmalloc.h"
+
+#if !defined (strchr) && !defined (__STDC__)
+extern char *strchr (), *strrchr ();
+#endif /* !strchr && !__STDC__ */
+
+static void update_line PARAMS((char *, char *, int, int, int, int));
+static void space_to_eol PARAMS((int));
+static void delete_chars PARAMS((int));
+static void insert_some_chars PARAMS((char *, int, int));
+static void cr PARAMS((void));
+
+#if defined (HANDLE_MULTIBYTE)
+static int _rl_col_width PARAMS((const char *, int, int));
+static int *_rl_wrapped_line;
+#else
+#  define _rl_col_width(l, s, e)        (((e) <= (s)) ? 0 : (e) - (s))
+#endif
+
+static int *inv_lbreaks, *vis_lbreaks;
+static int inv_lbsize, vis_lbsize;
+
+/* Heuristic used to decide whether it is faster to move from CUR to NEW
+   by backing up or outputting a carriage return and moving forward.  CUR
+   and NEW are either both buffer positions or absolute screen positions. */
+#define CR_FASTER(new, cur) (((new) + 1) < ((cur) - (new)))
+
+/* _rl_last_c_pos is an absolute cursor position in multibyte locales and a
+   buffer index in others.  This macro is used when deciding whether the
+   current cursor position is in the middle of a prompt string containing
+   invisible characters. */
+#define PROMPT_ENDING_INDEX \
+  ((MB_CUR_MAX > 1 && rl_byte_oriented == 0) ? prompt_physical_chars : prompt_last_invisible+1)
+  
+
+/* **************************************************************** */
+/*                                                                  */
+/*                      Display stuff                               */
+/*                                                                  */
+/* **************************************************************** */
+
+/* This is the stuff that is hard for me.  I never seem to write good
+   display routines in C.  Let's see how I do this time. */
+
+/* (PWP) Well... Good for a simple line updater, but totally ignores
+   the problems of input lines longer than the screen width.
+
+   update_line and the code that calls it makes a multiple line,
+   automatically wrapping line update.  Careful attention needs
+   to be paid to the vertical position variables. */
+
+/* Keep two buffers; one which reflects the current contents of the
+   screen, and the other to draw what we think the new contents should
+   be.  Then compare the buffers, and make whatever changes to the
+   screen itself that we should.  Finally, make the buffer that we
+   just drew into be the one which reflects the current contents of the
+   screen, and place the cursor where it belongs.
+
+   Commands that want to can fix the display themselves, and then let
+   this function know that the display has been fixed by setting the
+   RL_DISPLAY_FIXED variable.  This is good for efficiency. */
+
+/* Application-specific redisplay function. */
+rl_voidfunc_t *rl_redisplay_function = rl_redisplay;
+
+/* Global variables declared here. */
+/* What YOU turn on when you have handled all redisplay yourself. */
+int rl_display_fixed = 0;
+
+int _rl_suppress_redisplay = 0;
+int _rl_want_redisplay = 0;
+
+/* The stuff that gets printed out before the actual text of the line.
+   This is usually pointing to rl_prompt. */
+char *rl_display_prompt = (char *)NULL;
+
+/* Pseudo-global variables declared here. */
+
+/* The visible cursor position.  If you print some text, adjust this. */
+/* NOTE: _rl_last_c_pos is used as a buffer index when not in a locale
+   supporting multibyte characters, and an absolute cursor position when
+   in such a locale.  This is an artifact of the donated multibyte support.
+   Care must be taken when modifying its value. */
+int _rl_last_c_pos = 0;
+int _rl_last_v_pos = 0;
+
+static int cpos_adjusted;
+static int cpos_buffer_position;
+
+/* Number of lines currently on screen minus 1. */
+int _rl_vis_botlin = 0;
+
+/* Variables used only in this file. */
+/* The last left edge of text that was displayed.  This is used when
+   doing horizontal scrolling.  It shifts in thirds of a screenwidth. */
+static int last_lmargin;
+
+/* The line display buffers.  One is the line currently displayed on
+   the screen.  The other is the line about to be displayed. */
+static char *visible_line = (char *)NULL;
+static char *invisible_line = (char *)NULL;
+
+/* A buffer for `modeline' messages. */
+static char msg_buf[128];
+
+/* Non-zero forces the redisplay even if we thought it was unnecessary. */
+static int forced_display;
+
+/* Default and initial buffer size.  Can grow. */
+static int line_size = 1024;
+
+/* Variables to keep track of the expanded prompt string, which may
+   include invisible characters. */
+
+static char *local_prompt, *local_prompt_prefix;
+static int local_prompt_len;
+static int prompt_visible_length, prompt_prefix_length;
+
+/* The number of invisible characters in the line currently being
+   displayed on the screen. */
+static int visible_wrap_offset;
+
+/* The number of invisible characters in the prompt string.  Static so it
+   can be shared between rl_redisplay and update_line */
+static int wrap_offset;
+
+/* The index of the last invisible character in the prompt string. */
+static int prompt_last_invisible;
+
+/* The length (buffer offset) of the first line of the last (possibly
+   multi-line) buffer displayed on the screen. */
+static int visible_first_line_len;
+
+/* Number of invisible characters on the first physical line of the prompt.
+   Only valid when the number of physical characters in the prompt exceeds
+   (or is equal to) _rl_screenwidth. */
+static int prompt_invis_chars_first_line;
+
+static int prompt_last_screen_line;
+
+static int prompt_physical_chars;
+
+/* Variables to save and restore prompt and display information. */
+
+/* These are getting numerous enough that it's time to create a struct. */
+
+static char *saved_local_prompt;
+static char *saved_local_prefix;
+static int saved_last_invisible;
+static int saved_visible_length;
+static int saved_prefix_length;
+static int saved_local_length;
+static int saved_invis_chars_first_line;
+static int saved_physical_chars;
+
+/* Expand the prompt string S and return the number of visible
+   characters in *LP, if LP is not null.  This is currently more-or-less
+   a placeholder for expansion.  LIP, if non-null is a place to store the
+   index of the last invisible character in the returned string. NIFLP,
+   if non-zero, is a place to store the number of invisible characters in
+   the first prompt line.  The previous are used as byte counts -- indexes
+   into a character buffer. */
+
+/* Current implementation:
+        \001 (^A) start non-visible characters
+        \002 (^B) end non-visible characters
+   all characters except \001 and \002 (following a \001) are copied to
+   the returned string; all characters except those between \001 and
+   \002 are assumed to be `visible'. */ 
+
+static char *
+expand_prompt (pmt, lp, lip, niflp, vlp)
+     char *pmt;
+     int *lp, *lip, *niflp, *vlp;
+{
+  char *r, *ret, *p, *igstart;
+  int l, rl, last, ignoring, ninvis, invfl, invflset, ind, pind, physchars;
+
+  /* Short-circuit if we can. */
+  if ((MB_CUR_MAX <= 1 || rl_byte_oriented) && strchr (pmt, RL_PROMPT_START_IGNORE) == 0)
+    {
+      r = savestring (pmt);
+      if (lp)
+        *lp = strlen (r);
+      if (lip)
+        *lip = 0;
+      if (niflp)
+        *niflp = 0;
+      if (vlp)
+        *vlp = lp ? *lp : strlen (r);
+      return r;
+    }
+
+  l = strlen (pmt);
+  r = ret = (char *)xmalloc (l + 1);
+
+  invfl = 0;    /* invisible chars in first line of prompt */
+  invflset = 0; /* we only want to set invfl once */
+
+  igstart = 0;
+  for (rl = ignoring = last = ninvis = physchars = 0, p = pmt; p && *p; p++)
+    {
+      /* This code strips the invisible character string markers
+         RL_PROMPT_START_IGNORE and RL_PROMPT_END_IGNORE */
+      if (ignoring == 0 && *p == RL_PROMPT_START_IGNORE)                /* XXX - check ignoring? */
+        {
+          ignoring = 1;
+          igstart = p;
+          continue;
+        }
+      else if (ignoring && *p == RL_PROMPT_END_IGNORE)
+        {
+          ignoring = 0;
+          if (p != (igstart + 1))
+            last = r - ret - 1;
+          continue;
+        }
+      else
+        {
+#if defined (HANDLE_MULTIBYTE)
+          if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+            {
+              pind = p - pmt;
+              ind = _rl_find_next_mbchar (pmt, pind, 1, MB_FIND_NONZERO);
+              l = ind - pind;
+              while (l--)
+                *r++ = *p++;
+              if (!ignoring)
+                {
+                  rl += ind - pind;
+                  physchars += _rl_col_width (pmt, pind, ind);
+                }
+              else
+                ninvis += ind - pind;
+              p--;                      /* compensate for later increment */
+            }
+          else
+#endif
+            {
+              *r++ = *p;
+              if (!ignoring)
+                {
+                  rl++;                 /* visible length byte counter */
+                  physchars++;
+                }
+              else
+                ninvis++;               /* invisible chars byte counter */
+            }
+
+          if (invflset == 0 && rl >= _rl_screenwidth)
+            {
+              invfl = ninvis;
+              invflset = 1;
+            }
+        }
+    }
+
+  if (rl < _rl_screenwidth)
+    invfl = ninvis;
+
+  *r = '\0';
+  if (lp)
+    *lp = rl;
+  if (lip)
+    *lip = last;
+  if (niflp)
+    *niflp = invfl;
+  if  (vlp)
+    *vlp = physchars;
+  return ret;
+}
+
+/* Just strip out RL_PROMPT_START_IGNORE and RL_PROMPT_END_IGNORE from
+   PMT and return the rest of PMT. */
+char *
+_rl_strip_prompt (pmt)
+     char *pmt;
+{
+  char *ret;
+
+  ret = expand_prompt (pmt, (int *)NULL, (int *)NULL, (int *)NULL, (int *)NULL);
+  return ret;
+}
+
+/*
+ * Expand the prompt string into the various display components, if
+ * necessary.
+ *
+ * local_prompt = expanded last line of string in rl_display_prompt
+ *                (portion after the final newline)
+ * local_prompt_prefix = portion before last newline of rl_display_prompt,
+ *                       expanded via expand_prompt
+ * prompt_visible_length = number of visible characters in local_prompt
+ * prompt_prefix_length = number of visible characters in local_prompt_prefix
+ *
+ * This function is called once per call to readline().  It may also be
+ * called arbitrarily to expand the primary prompt.
+ *
+ * The return value is the number of visible characters on the last line
+ * of the (possibly multi-line) prompt.
+ */
+int
+rl_expand_prompt (prompt)
+     char *prompt;
+{
+  char *p, *t;
+  int c;
+
+  /* Clear out any saved values. */
+  FREE (local_prompt);
+  FREE (local_prompt_prefix);
+
+  local_prompt = local_prompt_prefix = (char *)0;
+  local_prompt_len = 0;
+  prompt_last_invisible = prompt_invis_chars_first_line = 0;
+  prompt_visible_length = prompt_physical_chars = 0;
+
+  if (prompt == 0 || *prompt == 0)
+    return (0);
+
+  p = strrchr (prompt, '\n');
+  if (!p)
+    {
+      /* The prompt is only one logical line, though it might wrap. */
+      local_prompt = expand_prompt (prompt, &prompt_visible_length,
+                                            &prompt_last_invisible,
+                                            &prompt_invis_chars_first_line,
+                                            &prompt_physical_chars);
+      local_prompt_prefix = (char *)0;
+      local_prompt_len = local_prompt ? strlen (local_prompt) : 0;
+      return (prompt_visible_length);
+    }
+  else
+    {
+      /* The prompt spans multiple lines. */
+      t = ++p;
+      local_prompt = expand_prompt (p, &prompt_visible_length,
+                                       &prompt_last_invisible,
+                                       &prompt_invis_chars_first_line,
+                                       &prompt_physical_chars);
+      c = *t; *t = '\0';
+      /* The portion of the prompt string up to and including the
+         final newline is now null-terminated. */
+      local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
+                                                   (int *)NULL,
+                                                   (int *)NULL,
+                                                   (int *)NULL);
+      *t = c;
+      local_prompt_len = local_prompt ? strlen (local_prompt) : 0;
+      return (prompt_prefix_length);
+    }
+}
+
+/* Initialize the VISIBLE_LINE and INVISIBLE_LINE arrays, and their associated
+   arrays of line break markers.  MINSIZE is the minimum size of VISIBLE_LINE
+   and INVISIBLE_LINE; if it is greater than LINE_SIZE, LINE_SIZE is
+   increased.  If the lines have already been allocated, this ensures that
+   they can hold at least MINSIZE characters. */
+static void
+init_line_structures (minsize)
+      int minsize;
+{
+  register int n;
+
+  if (invisible_line == 0)      /* initialize it */
+    {
+      if (line_size < minsize)
+        line_size = minsize;
+      visible_line = (char *)xmalloc (line_size);
+      invisible_line = (char *)xmalloc (line_size);
+    }
+  else if (line_size < minsize) /* ensure it can hold MINSIZE chars */
+    {
+      line_size *= 2;
+      if (line_size < minsize)
+        line_size = minsize;
+      visible_line = (char *)xrealloc (visible_line, line_size);
+      invisible_line = (char *)xrealloc (invisible_line, line_size);
+    }
+
+  for (n = minsize; n < line_size; n++)
+    {
+      visible_line[n] = 0;
+      invisible_line[n] = 1;
+    }
+
+  if (vis_lbreaks == 0)
+    {
+      /* should be enough. */
+      inv_lbsize = vis_lbsize = 256;
+      inv_lbreaks = (int *)xmalloc (inv_lbsize * sizeof (int));
+      vis_lbreaks = (int *)xmalloc (vis_lbsize * sizeof (int));
+#if defined (HANDLE_MULTIBYTE)
+      _rl_wrapped_line = (int *)xmalloc (vis_lbsize * sizeof (int));
+#endif
+      inv_lbreaks[0] = vis_lbreaks[0] = 0;
+    }
+}
+  
+/* Basic redisplay algorithm. */
+void
+rl_redisplay ()
+{
+  register int in, out, c, linenum, cursor_linenum;
+  register char *line;
+  int inv_botlin, lb_botlin, lb_linenum, o_cpos;
+  int newlines, lpos, temp, modmark, n0, num;
+  char *prompt_this_line;
+#if defined (HANDLE_MULTIBYTE)
+  wchar_t wc;
+  size_t wc_bytes;
+  int wc_width;
+  mbstate_t ps;
+  int _rl_wrapped_multicolumn = 0;
+#endif
+
+  if (!readline_echoing_p)
+    return;
+
+  if (!rl_display_prompt)
+    rl_display_prompt = "";
+
+  if (invisible_line == 0 || vis_lbreaks == 0)
+    {
+      init_line_structures (0);
+      rl_on_new_line ();
+    }
+
+  /* Draw the line into the buffer. */
+  cpos_buffer_position = -1;
+
+  line = invisible_line;
+  out = inv_botlin = 0;
+
+  /* Mark the line as modified or not.  We only do this for history
+     lines. */
+  modmark = 0;
+  if (_rl_mark_modified_lines && current_history () && rl_undo_list)
+    {
+      line[out++] = '*';
+      line[out] = '\0';
+      modmark = 1;
+    }
+
+  /* If someone thought that the redisplay was handled, but the currently
+     visible line has a different modification state than the one about
+     to become visible, then correct the caller's misconception. */
+  if (visible_line[0] != invisible_line[0])
+    rl_display_fixed = 0;
+
+  /* If the prompt to be displayed is the `primary' readline prompt (the
+     one passed to readline()), use the values we have already expanded.
+     If not, use what's already in rl_display_prompt.  WRAP_OFFSET is the
+     number of non-visible characters in the prompt string. */
+  if (rl_display_prompt == rl_prompt || local_prompt)
+    {
+      if (local_prompt_prefix && forced_display)
+        _rl_output_some_chars (local_prompt_prefix, strlen (local_prompt_prefix));
+
+      if (local_prompt_len > 0)
+        {
+          temp = local_prompt_len + out + 2;
+          if (temp >= line_size)
+            {
+              line_size = (temp + 1024) - (temp % 1024);
+              visible_line = (char *)xrealloc (visible_line, line_size);
+              line = invisible_line = (char *)xrealloc (invisible_line, line_size);
+            }
+          strncpy (line + out, local_prompt, local_prompt_len);
+          out += local_prompt_len;
+        }
+      line[out] = '\0';
+      wrap_offset = local_prompt_len - prompt_visible_length;
+    }
+  else
+    {
+      int pmtlen;
+      prompt_this_line = strrchr (rl_display_prompt, '\n');
+      if (!prompt_this_line)
+        prompt_this_line = rl_display_prompt;
+      else
+        {
+          prompt_this_line++;
+          pmtlen = prompt_this_line - rl_display_prompt;        /* temp var */
+          if (forced_display)
+            {
+              _rl_output_some_chars (rl_display_prompt, pmtlen);
+              /* Make sure we are at column zero even after a newline,
+                 regardless of the state of terminal output processing. */
+              if (pmtlen < 2 || prompt_this_line[-2] != '\r')
+                cr ();
+            }
+        }
+
+      prompt_physical_chars = pmtlen = strlen (prompt_this_line);
+      temp = pmtlen + out + 2;
+      if (temp >= line_size)
+        {
+          line_size = (temp + 1024) - (temp % 1024);
+          visible_line = (char *)xrealloc (visible_line, line_size);
+          line = invisible_line = (char *)xrealloc (invisible_line, line_size);
+        }
+      strncpy (line + out,  prompt_this_line, pmtlen);
+      out += pmtlen;
+      line[out] = '\0';
+      wrap_offset = prompt_invis_chars_first_line = 0;
+    }
+
+#if defined (HANDLE_MULTIBYTE)
+#define CHECK_INV_LBREAKS() \
+      do { \
+        if (newlines >= (inv_lbsize - 2)) \
+          { \
+            inv_lbsize *= 2; \
+            inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
+            _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \
+          } \
+      } while (0)
+#else
+#define CHECK_INV_LBREAKS() \
+      do { \
+        if (newlines >= (inv_lbsize - 2)) \
+          { \
+            inv_lbsize *= 2; \
+            inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
+          } \
+      } while (0)
+#endif /* HANDLE_MULTIBYTE */
+
+#if defined (HANDLE_MULTIBYTE)    
+#define CHECK_LPOS() \
+      do { \
+        lpos++; \
+        if (lpos >= _rl_screenwidth) \
+          { \
+            if (newlines >= (inv_lbsize - 2)) \
+              { \
+                inv_lbsize *= 2; \
+                inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
+                _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \
+              } \
+            inv_lbreaks[++newlines] = out; \
+            _rl_wrapped_line[newlines] = _rl_wrapped_multicolumn; \
+            lpos = 0; \
+          } \
+      } while (0)
+#else
+#define CHECK_LPOS() \
+      do { \
+        lpos++; \
+        if (lpos >= _rl_screenwidth) \
+          { \
+            if (newlines >= (inv_lbsize - 2)) \
+              { \
+                inv_lbsize *= 2; \
+                inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
+              } \
+            inv_lbreaks[++newlines] = out; \
+            lpos = 0; \
+          } \
+      } while (0)
+#endif
+
+  /* inv_lbreaks[i] is where line i starts in the buffer. */
+  inv_lbreaks[newlines = 0] = 0;
+#if 0
+  lpos = out - wrap_offset;
+#else
+  lpos = prompt_physical_chars + modmark;
+#endif
+
+#if defined (HANDLE_MULTIBYTE)
+  memset (_rl_wrapped_line, 0, vis_lbsize);
+  num = 0;
+#endif
+
+  /* prompt_invis_chars_first_line is the number of invisible characters in
+     the first physical line of the prompt.
+     wrap_offset - prompt_invis_chars_first_line is the number of invis
+     chars on the second line. */
+
+  /* what if lpos is already >= _rl_screenwidth before we start drawing the
+     contents of the command line? */
+  while (lpos >= _rl_screenwidth)
+    {
+      int z;
+      /* fix from Darin Johnson <darin@acuson.com> for prompt string with
+         invisible characters that is longer than the screen width.  The
+         prompt_invis_chars_first_line variable could be made into an array
+         saying how many invisible characters there are per line, but that's
+         probably too much work for the benefit gained.  How many people have
+         prompts that exceed two physical lines?
+         Additional logic fix from Edward Catmur <ed@catmur.co.uk> */
+#if defined (HANDLE_MULTIBYTE)
+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+        {
+          n0 = num;
+          temp = local_prompt_len;
+          while (num < temp)
+            {
+              z = _rl_col_width  (local_prompt, n0, num);
+              if (z > _rl_screenwidth)
+                {
+                  num = _rl_find_prev_mbchar (local_prompt, num, MB_FIND_ANY);
+                  break;
+                }
+              else if (z == _rl_screenwidth)
+                break;
+              num++;
+            }
+          temp = num;
+        }
+      else
+#endif /* !HANDLE_MULTIBYTE */
+        temp = ((newlines + 1) * _rl_screenwidth);
+
+      /* Now account for invisible characters in the current line. */
+      temp += ((local_prompt_prefix == 0) ? ((newlines == 0) ? prompt_invis_chars_first_line
+                                                             : ((newlines == 1) ? wrap_offset : 0))
+                                          : ((newlines == 0) ? wrap_offset :0));
+             
+      inv_lbreaks[++newlines] = temp;
+#if defined (HANDLE_MULTIBYTE)
+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+        lpos -= _rl_col_width (local_prompt, n0, num);
+      else
+#endif
+        lpos -= _rl_screenwidth;
+    }
+
+  prompt_last_screen_line = newlines;
+
+  /* Draw the rest of the line (after the prompt) into invisible_line, keeping
+     track of where the cursor is (cpos_buffer_position), the number of the line containing
+     the cursor (lb_linenum), the last line number (lb_botlin and inv_botlin).
+     It maintains an array of line breaks for display (inv_lbreaks).
+     This handles expanding tabs for display and displaying meta characters. */
+  lb_linenum = 0;
+#if defined (HANDLE_MULTIBYTE)
+  in = 0;
+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+    {
+      memset (&ps, 0, sizeof (mbstate_t));
+      wc_bytes = mbrtowc (&wc, rl_line_buffer, rl_end, &ps);
+    }
+  else
+    wc_bytes = 1;
+  while (in < rl_end)
+#else
+  for (in = 0; in < rl_end; in++)
+#endif
+    {
+      c = (unsigned char)rl_line_buffer[in];
+
+#if defined (HANDLE_MULTIBYTE)
+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+        {
+          if (MB_INVALIDCH (wc_bytes))
+            {
+              /* Byte sequence is invalid or shortened.  Assume that the
+                 first byte represents a character. */
+              wc_bytes = 1;
+              /* Assume that a character occupies a single column. */
+              wc_width = 1;
+              memset (&ps, 0, sizeof (mbstate_t));
+            }
+          else if (MB_NULLWCH (wc_bytes))
+            break;                      /* Found '\0' */
+          else
+            {
+              temp = wcwidth (wc);
+              wc_width = (temp >= 0) ? temp : 1;
+            }
+        }
+#endif
+
+      if (out + 8 >= line_size)         /* XXX - 8 for \t */
+        {
+          line_size *= 2;
+          visible_line = (char *)xrealloc (visible_line, line_size);
+          invisible_line = (char *)xrealloc (invisible_line, line_size);
+          line = invisible_line;
+        }
+
+      if (in == rl_point)
+        {
+          cpos_buffer_position = out;
+          lb_linenum = newlines;
+        }
+
+#if defined (HANDLE_MULTIBYTE)
+      if (META_CHAR (c) && _rl_output_meta_chars == 0)  /* XXX - clean up */
+#else
+      if (META_CHAR (c))
+#endif
+        {
+          if (_rl_output_meta_chars == 0)
+            {
+              sprintf (line + out, "\\%o", c);
+
+              if (lpos + 4 >= _rl_screenwidth)
+                {
+                  temp = _rl_screenwidth - lpos;
+                  CHECK_INV_LBREAKS ();
+                  inv_lbreaks[++newlines] = out + temp;
+                  lpos = 4 - temp;
+                }
+              else
+                lpos += 4;
+
+              out += 4;
+            }
+          else
+            {
+              line[out++] = c;
+              CHECK_LPOS();
+            }
+        }
+#if defined (DISPLAY_TABS)
+      else if (c == '\t')
+        {
+          register int newout;
+
+#if 0
+          newout = (out | (int)7) + 1;
+#else
+          newout = out + 8 - lpos % 8;
+#endif
+          temp = newout - out;
+          if (lpos + temp >= _rl_screenwidth)
+            {
+              register int temp2;
+              temp2 = _rl_screenwidth - lpos;
+              CHECK_INV_LBREAKS ();
+              inv_lbreaks[++newlines] = out + temp2;
+              lpos = temp - temp2;
+              while (out < newout)
+                line[out++] = ' ';
+            }
+          else
+            {
+              while (out < newout)
+                line[out++] = ' ';
+              lpos += temp;
+            }
+        }
+#endif
+      else if (c == '\n' && _rl_horizontal_scroll_mode == 0 && _rl_term_up && *_rl_term_up)
+        {
+          line[out++] = '\0';   /* XXX - sentinel */
+          CHECK_INV_LBREAKS ();
+          inv_lbreaks[++newlines] = out;
+          lpos = 0;
+        }
+      else if (CTRL_CHAR (c) || c == RUBOUT)
+        {
+          line[out++] = '^';
+          CHECK_LPOS();
+          line[out++] = CTRL_CHAR (c) ? UNCTRL (c) : '?';
+          CHECK_LPOS();
+        }
+      else
+        {
+#if defined (HANDLE_MULTIBYTE)
+          if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+            {
+              register int i;
+
+              _rl_wrapped_multicolumn = 0;
+
+              if (_rl_screenwidth < lpos + wc_width)
+                for (i = lpos; i < _rl_screenwidth; i++)
+                  {
+                    /* The space will be removed in update_line() */
+                    line[out++] = ' ';
+                    _rl_wrapped_multicolumn++;
+                    CHECK_LPOS();
+                  }
+              if (in == rl_point)
+                {
+                  cpos_buffer_position = out;
+                  lb_linenum = newlines;
+                }
+              for (i = in; i < in+wc_bytes; i++)
+                line[out++] = rl_line_buffer[i];
+              for (i = 0; i < wc_width; i++)
+                CHECK_LPOS();
+            }
+          else
+            {
+              line[out++] = c;
+              CHECK_LPOS();
+            }
+#else
+          line[out++] = c;
+          CHECK_LPOS();
+#endif
+        }
+
+#if defined (HANDLE_MULTIBYTE)
+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+        {
+          in += wc_bytes;
+          wc_bytes = mbrtowc (&wc, rl_line_buffer + in, rl_end - in, &ps);
+        }
+      else
+        in++;
+#endif
+
+    }
+  line[out] = '\0';
+  if (cpos_buffer_position < 0)
+    {
+      cpos_buffer_position = out;
+      lb_linenum = newlines;
+    }
+
+  inv_botlin = lb_botlin = newlines;
+  CHECK_INV_LBREAKS ();
+  inv_lbreaks[newlines+1] = out;
+  cursor_linenum = lb_linenum;
+
+  /* CPOS_BUFFER_POSITION == position in buffer where cursor should be placed.
+     CURSOR_LINENUM == line number where the cursor should be placed. */
+
+  /* PWP: now is when things get a bit hairy.  The visible and invisible
+     line buffers are really multiple lines, which would wrap every
+     (screenwidth - 1) characters.  Go through each in turn, finding
+     the changed region and updating it.  The line order is top to bottom. */
+
+  /* If we can move the cursor up and down, then use multiple lines,
+     otherwise, let long lines display in a single terminal line, and
+     horizontally scroll it. */
+
+  if (_rl_horizontal_scroll_mode == 0 && _rl_term_up && *_rl_term_up)
+    {
+      int nleft, pos, changed_screen_line, tx;
+
+      if (!rl_display_fixed || forced_display)
+        {
+          forced_display = 0;
+
+          /* If we have more than a screenful of material to display, then
+             only display a screenful.  We should display the last screen,
+             not the first.  */
+          if (out >= _rl_screenchars)
+            {
+              if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+                out = _rl_find_prev_mbchar (line, _rl_screenchars, MB_FIND_ANY);
+              else
+                out = _rl_screenchars - 1;
+            }
+
+          /* The first line is at character position 0 in the buffer.  The
+             second and subsequent lines start at inv_lbreaks[N], offset by
+             OFFSET (which has already been calculated above).  */
+
+#define W_OFFSET(line, offset) ((line) == 0 ? offset : 0)
+#define VIS_LLEN(l)     ((l) > _rl_vis_botlin ? 0 : (vis_lbreaks[l+1] - vis_lbreaks[l]))
+#define INV_LLEN(l)     (inv_lbreaks[l+1] - inv_lbreaks[l])
+#define VIS_CHARS(line) (visible_line + vis_lbreaks[line])
+#define VIS_LINE(line) ((line) > _rl_vis_botlin) ? "" : VIS_CHARS(line)
+#define INV_LINE(line) (invisible_line + inv_lbreaks[line])
+
+          /* For each line in the buffer, do the updating display. */
+          for (linenum = 0; linenum <= inv_botlin; linenum++)
+            {
+              /* This can lead us astray if we execute a program that changes
+                 the locale from a non-multibyte to a multibyte one. */
+              o_cpos = _rl_last_c_pos;
+              cpos_adjusted = 0;
+              update_line (VIS_LINE(linenum), INV_LINE(linenum), linenum,
+                           VIS_LLEN(linenum), INV_LLEN(linenum), inv_botlin);
+
+              /* update_line potentially changes _rl_last_c_pos, but doesn't
+                 take invisible characters into account, since _rl_last_c_pos
+                 is an absolute cursor position in a multibyte locale.  See
+                 if compensating here is the right thing, or if we have to
+                 change update_line itself.  There is one case in which
+                 update_line adjusts _rl_last_c_pos itself (so it can pass
+                 _rl_move_cursor_relative accurate values); it communicates
+                 this back by setting cpos_adjusted.  If we assume that
+                 _rl_last_c_pos is correct (an absolute cursor position) each
+                 time update_line is called, then we can assume in our
+                 calculations that o_cpos does not need to be adjusted by
+                 wrap_offset. */
+              if (linenum == 0 && (MB_CUR_MAX > 1 && rl_byte_oriented == 0) &&
+                  cpos_adjusted == 0 &&
+                  _rl_last_c_pos != o_cpos &&
+                  _rl_last_c_pos > wrap_offset &&
+                  o_cpos < prompt_last_invisible)
+                _rl_last_c_pos -= wrap_offset;
+                  
+              /* If this is the line with the prompt, we might need to
+                 compensate for invisible characters in the new line. Do
+                 this only if there is not more than one new line (which
+                 implies that we completely overwrite the old visible line)
+                 and the new line is shorter than the old.  Make sure we are
+                 at the end of the new line before clearing. */
+              if (linenum == 0 &&
+                  inv_botlin == 0 && _rl_last_c_pos == out &&
+                  (wrap_offset > visible_wrap_offset) &&
+                  (_rl_last_c_pos < visible_first_line_len))
+                {
+                  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+                    nleft = _rl_screenwidth - _rl_last_c_pos;
+                  else
+                    nleft = _rl_screenwidth + wrap_offset - _rl_last_c_pos;
+                  if (nleft)
+                    _rl_clear_to_eol (nleft);
+                }
+
+              /* Since the new first line is now visible, save its length. */
+              if (linenum == 0)
+                visible_first_line_len = (inv_botlin > 0) ? inv_lbreaks[1] : out - wrap_offset;
+            }
+
+          /* We may have deleted some lines.  If so, clear the left over
+             blank ones at the bottom out. */
+          if (_rl_vis_botlin > inv_botlin)
+            {
+              char *tt;
+              for (; linenum <= _rl_vis_botlin; linenum++)
+                {
+                  tt = VIS_CHARS (linenum);
+                  _rl_move_vert (linenum);
+                  _rl_move_cursor_relative (0, tt);
+                  _rl_clear_to_eol
+                    ((linenum == _rl_vis_botlin) ? strlen (tt) : _rl_screenwidth);
+                }
+            }
+          _rl_vis_botlin = inv_botlin;
+
+          /* CHANGED_SCREEN_LINE is set to 1 if we have moved to a
+             different screen line during this redisplay. */
+          changed_screen_line = _rl_last_v_pos != cursor_linenum;
+          if (changed_screen_line)
+            {
+              _rl_move_vert (cursor_linenum);
+              /* If we moved up to the line with the prompt using _rl_term_up,
+                 the physical cursor position on the screen stays the same,
+                 but the buffer position needs to be adjusted to account
+                 for invisible characters. */
+              if ((MB_CUR_MAX == 1 || rl_byte_oriented) && cursor_linenum == 0 && wrap_offset)
+                _rl_last_c_pos += wrap_offset;
+            }
+
+          /* We have to reprint the prompt if it contains invisible
+             characters, since it's not generally OK to just reprint
+             the characters from the current cursor position.  But we
+             only need to reprint it if the cursor is before the last
+             invisible character in the prompt string. */
+          nleft = prompt_visible_length + wrap_offset;
+          if (cursor_linenum == 0 && wrap_offset > 0 && _rl_last_c_pos > 0 &&
+#if 0
+              _rl_last_c_pos <= PROMPT_ENDING_INDEX && local_prompt)
+#else
+              _rl_last_c_pos < PROMPT_ENDING_INDEX && local_prompt)
+#endif
+            {
+#if defined (__MSDOS__)
+              putc ('\r', rl_outstream);
+#else
+              if (_rl_term_cr)
+                tputs (_rl_term_cr, 1, _rl_output_character_function);
+#endif
+              _rl_output_some_chars (local_prompt, nleft);
+              if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+                _rl_last_c_pos = _rl_col_width (local_prompt, 0, nleft) - wrap_offset;
+              else
+                _rl_last_c_pos = nleft;
+            }
+
+          /* Where on that line?  And where does that line start
+             in the buffer? */
+          pos = inv_lbreaks[cursor_linenum];
+          /* nleft == number of characters in the line buffer between the
+             start of the line and the desired cursor position. */
+          nleft = cpos_buffer_position - pos;
+
+          /* NLEFT is now a number of characters in a buffer.  When in a
+             multibyte locale, however, _rl_last_c_pos is an absolute cursor
+             position that doesn't take invisible characters in the prompt
+             into account.  We use a fudge factor to compensate. */
+
+          /* Since _rl_backspace() doesn't know about invisible characters in the
+             prompt, and there's no good way to tell it, we compensate for
+             those characters here and call _rl_backspace() directly. */
+          if (wrap_offset && cursor_linenum == 0 && nleft < _rl_last_c_pos)
+            {
+              /* TX == new physical cursor position in multibyte locale. */
+              if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+                tx = _rl_col_width (&visible_line[pos], 0, nleft) - visible_wrap_offset;
+              else
+                tx = nleft;
+              if (tx >= 0 && _rl_last_c_pos > tx)
+                {
+                  _rl_backspace (_rl_last_c_pos - tx);  /* XXX */
+                  _rl_last_c_pos = tx;
+                }
+            }
+
+          /* We need to note that in a multibyte locale we are dealing with
+             _rl_last_c_pos as an absolute cursor position, but moving to a
+             point specified by a buffer position (NLEFT) that doesn't take
+             invisible characters into account. */
+          if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+            _rl_move_cursor_relative (nleft, &invisible_line[pos]);
+          else if (nleft != _rl_last_c_pos)
+            _rl_move_cursor_relative (nleft, &invisible_line[pos]);
+        }
+    }
+  else                          /* Do horizontal scrolling. */
+    {
+#define M_OFFSET(margin, offset) ((margin) == 0 ? offset : 0)
+      int lmargin, ndisp, nleft, phys_c_pos, t;
+
+      /* Always at top line. */
+      _rl_last_v_pos = 0;
+
+      /* Compute where in the buffer the displayed line should start.  This
+         will be LMARGIN. */
+
+      /* The number of characters that will be displayed before the cursor. */
+      ndisp = cpos_buffer_position - wrap_offset;
+      nleft  = prompt_visible_length + wrap_offset;
+      /* Where the new cursor position will be on the screen.  This can be
+         longer than SCREENWIDTH; if it is, lmargin will be adjusted. */
+      phys_c_pos = cpos_buffer_position - (last_lmargin ? last_lmargin : wrap_offset);
+      t = _rl_screenwidth / 3;
+
+      /* If the number of characters had already exceeded the screenwidth,
+         last_lmargin will be > 0. */
+
+      /* If the number of characters to be displayed is more than the screen
+         width, compute the starting offset so that the cursor is about
+         two-thirds of the way across the screen. */
+      if (phys_c_pos > _rl_screenwidth - 2)
+        {
+          lmargin = cpos_buffer_position - (2 * t);
+          if (lmargin < 0)
+            lmargin = 0;
+          /* If the left margin would be in the middle of a prompt with
+             invisible characters, don't display the prompt at all. */
+          if (wrap_offset && lmargin > 0 && lmargin < nleft)
+            lmargin = nleft;
+        }
+      else if (ndisp < _rl_screenwidth - 2)             /* XXX - was -1 */
+        lmargin = 0;
+      else if (phys_c_pos < 1)
+        {
+          /* If we are moving back towards the beginning of the line and
+             the last margin is no longer correct, compute a new one. */
+          lmargin = ((cpos_buffer_position - 1) / t) * t;       /* XXX */
+          if (wrap_offset && lmargin > 0 && lmargin < nleft)
+            lmargin = nleft;
+        }
+      else
+        lmargin = last_lmargin;
+
+      /* If the first character on the screen isn't the first character
+         in the display line, indicate this with a special character. */
+      if (lmargin > 0)
+        line[lmargin] = '<';
+
+      /* If SCREENWIDTH characters starting at LMARGIN do not encompass
+         the whole line, indicate that with a special character at the
+         right edge of the screen.  If LMARGIN is 0, we need to take the
+         wrap offset into account. */
+      t = lmargin + M_OFFSET (lmargin, wrap_offset) + _rl_screenwidth;
+      if (t < out)
+        line[t - 1] = '>';
+
+      if (!rl_display_fixed || forced_display || lmargin != last_lmargin)
+        {
+          forced_display = 0;
+          update_line (&visible_line[last_lmargin],
+                       &invisible_line[lmargin],
+                       0,
+                       _rl_screenwidth + visible_wrap_offset,
+                       _rl_screenwidth + (lmargin ? 0 : wrap_offset),
+                       0);
+
+          /* If the visible new line is shorter than the old, but the number
+             of invisible characters is greater, and we are at the end of
+             the new line, we need to clear to eol. */
+          t = _rl_last_c_pos - M_OFFSET (lmargin, wrap_offset);
+          if ((M_OFFSET (lmargin, wrap_offset) > visible_wrap_offset) &&
+              (_rl_last_c_pos == out) &&
+              t < visible_first_line_len)
+            {
+              nleft = _rl_screenwidth - t;
+              _rl_clear_to_eol (nleft);
+            }
+          visible_first_line_len = out - lmargin - M_OFFSET (lmargin, wrap_offset);
+          if (visible_first_line_len > _rl_screenwidth)
+            visible_first_line_len = _rl_screenwidth;
+
+          _rl_move_cursor_relative (cpos_buffer_position - lmargin, &invisible_line[lmargin]);
+          last_lmargin = lmargin;
+        }
+    }
+  fflush (rl_outstream);
+
+  /* Swap visible and non-visible lines. */
+  {
+    char *vtemp = visible_line;
+    int *itemp = vis_lbreaks, ntemp = vis_lbsize;
+
+    visible_line = invisible_line;
+    invisible_line = vtemp;
+
+    vis_lbreaks = inv_lbreaks;
+    inv_lbreaks = itemp;
+
+    vis_lbsize = inv_lbsize;
+    inv_lbsize = ntemp;
+
+    rl_display_fixed = 0;
+    /* If we are displaying on a single line, and last_lmargin is > 0, we
+       are not displaying any invisible characters, so set visible_wrap_offset
+       to 0. */
+    if (_rl_horizontal_scroll_mode && last_lmargin)
+      visible_wrap_offset = 0;
+    else
+      visible_wrap_offset = wrap_offset;
+  }
+}
+
+/* PWP: update_line() is based on finding the middle difference of each
+   line on the screen; vis:
+
+                             /old first difference
+        /beginning of line   |        /old last same       /old EOL
+        v                    v        v             v
+old:    eddie> Oh, my little gruntle-buggy is to me, as lurgid as
+new:    eddie> Oh, my little buggy says to me, as lurgid as
+        ^                    ^  ^                          ^
+        \beginning of line   |  \new last same     \new end of line
+                             \new first difference
+
+   All are character pointers for the sake of speed.  Special cases for
+   no differences, as well as for end of line additions must be handled.
+
+   Could be made even smarter, but this works well enough */
+static void
+update_line (old, new, current_line, omax, nmax, inv_botlin)
+     register char *old, *new;
+     int current_line, omax, nmax, inv_botlin;
+{
+  register char *ofd, *ols, *oe, *nfd, *nls, *ne;
+  int temp, lendiff, wsatend, od, nd, o_cpos;
+  int current_invis_chars;
+  int col_lendiff, col_temp;
+#if defined (HANDLE_MULTIBYTE)
+  mbstate_t ps_new, ps_old;
+  int new_offset, old_offset;
+#endif
+
+  /* If we're at the right edge of a terminal that supports xn, we're
+     ready to wrap around, so do so.  This fixes problems with knowing
+     the exact cursor position and cut-and-paste with certain terminal
+     emulators.  In this calculation, TEMP is the physical screen
+     position of the cursor. */
+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+    temp = _rl_last_c_pos;
+  else
+    temp = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset);
+  if (temp == _rl_screenwidth && _rl_term_autowrap && !_rl_horizontal_scroll_mode
+        && _rl_last_v_pos == current_line - 1)
+    {
+#if defined (HANDLE_MULTIBYTE)
+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+        {
+          wchar_t wc;
+          mbstate_t ps;
+          int tempwidth, bytes;
+          size_t ret;
+
+          /* This fixes only double-column characters, but if the wrapped
+             character comsumes more than three columns, spaces will be
+             inserted in the string buffer. */
+          if (_rl_wrapped_line[current_line] > 0)
+            _rl_clear_to_eol (_rl_wrapped_line[current_line]);
+
+          memset (&ps, 0, sizeof (mbstate_t));
+          ret = mbrtowc (&wc, new, MB_CUR_MAX, &ps);
+          if (MB_INVALIDCH (ret))
+            {
+              tempwidth = 1;
+              ret = 1;
+            }
+          else if (MB_NULLWCH (ret))
+            tempwidth = 0;
+          else
+            tempwidth = wcwidth (wc);
+
+          if (tempwidth > 0)
+            {
+              int count;
+              bytes = ret;
+              for (count = 0; count < bytes; count++)
+                putc (new[count], rl_outstream);
+              _rl_last_c_pos = tempwidth;
+              _rl_last_v_pos++;
+              memset (&ps, 0, sizeof (mbstate_t));
+              ret = mbrtowc (&wc, old, MB_CUR_MAX, &ps);
+              if (ret != 0 && bytes != 0)
+                {
+                  if (MB_INVALIDCH (ret))
+                    memmove (old+bytes, old+1, strlen (old+1));
+                  else
+                    memmove (old+bytes, old+ret, strlen (old+ret));
+                  memcpy (old, new, bytes);
+                }
+            }
+          else
+            {
+              putc (' ', rl_outstream);
+              _rl_last_c_pos = 1;
+              _rl_last_v_pos++;
+              if (old[0] && new[0])
+                old[0] = new[0];
+            }
+        }
+      else
+#endif
+        {
+          if (new[0])
+            putc (new[0], rl_outstream);
+          else
+            putc (' ', rl_outstream);
+          _rl_last_c_pos = 1;
+          _rl_last_v_pos++;
+          if (old[0] && new[0])
+            old[0] = new[0];
+        }
+    }
+
+      
+  /* Find first difference. */
+#if defined (HANDLE_MULTIBYTE)
+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+    {
+      /* See if the old line is a subset of the new line, so that the
+         only change is adding characters. */
+      temp = (omax < nmax) ? omax : nmax;
+      if (memcmp (old, new, temp) == 0)
+        {
+          ofd = old + temp;
+          nfd = new + temp;
+        }
+      else
+        {      
+          memset (&ps_new, 0, sizeof(mbstate_t));
+          memset (&ps_old, 0, sizeof(mbstate_t));
+
+          if (omax == nmax && STREQN (new, old, omax))
+            {
+              ofd = old + omax;
+              nfd = new + nmax;
+            }
+          else
+            {
+              new_offset = old_offset = 0;
+              for (ofd = old, nfd = new;
+                    (ofd - old < omax) && *ofd &&
+                    _rl_compare_chars(old, old_offset, &ps_old, new, new_offset, &ps_new); )
+                {
+                  old_offset = _rl_find_next_mbchar (old, old_offset, 1, MB_FIND_ANY);
+                  new_offset = _rl_find_next_mbchar (new, new_offset, 1, MB_FIND_ANY);
+                  ofd = old + old_offset;
+                  nfd = new + new_offset;
+                }
+            }
+        }
+    }
+  else
+#endif
+  for (ofd = old, nfd = new;
+       (ofd - old < omax) && *ofd && (*ofd == *nfd);
+       ofd++, nfd++)
+    ;
+
+  /* Move to the end of the screen line.  ND and OD are used to keep track
+     of the distance between ne and new and oe and old, respectively, to
+     move a subtraction out of each loop. */
+  for (od = ofd - old, oe = ofd; od < omax && *oe; oe++, od++);
+  for (nd = nfd - new, ne = nfd; nd < nmax && *ne; ne++, nd++);
+
+  /* If no difference, continue to next line. */
+  if (ofd == oe && nfd == ne)
+    return;
+
+  wsatend = 1;                  /* flag for trailing whitespace */
+
+#if defined (HANDLE_MULTIBYTE)
+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+    {
+      ols = old + _rl_find_prev_mbchar (old, oe - old, MB_FIND_ANY);
+      nls = new + _rl_find_prev_mbchar (new, ne - new, MB_FIND_ANY);
+      while ((ols > ofd) && (nls > nfd))
+        {
+          memset (&ps_old, 0, sizeof (mbstate_t));
+          memset (&ps_new, 0, sizeof (mbstate_t));
+
+#if 0
+          /* On advice from jir@yamato.ibm.com */
+          _rl_adjust_point (old, ols - old, &ps_old);
+          _rl_adjust_point (new, nls - new, &ps_new);
+#endif
+
+          if (_rl_compare_chars (old, ols - old, &ps_old, new, nls - new, &ps_new) == 0)
+            break;
+
+          if (*ols == ' ')
+            wsatend = 0;
+
+          ols = old + _rl_find_prev_mbchar (old, ols - old, MB_FIND_ANY);
+          nls = new + _rl_find_prev_mbchar (new, nls - new, MB_FIND_ANY);
+        }
+    }
+  else
+    {
+#endif /* HANDLE_MULTIBYTE */
+  ols = oe - 1;                 /* find last same */
+  nls = ne - 1;
+  while ((ols > ofd) && (nls > nfd) && (*ols == *nls))
+    {
+      if (*ols != ' ')
+        wsatend = 0;
+      ols--;
+      nls--;
+    }
+#if defined (HANDLE_MULTIBYTE)
+    }
+#endif
+
+  if (wsatend)
+    {
+      ols = oe;
+      nls = ne;
+    }
+#if defined (HANDLE_MULTIBYTE)
+  /* This may not work for stateful encoding, but who cares?  To handle
+     stateful encoding properly, we have to scan each string from the
+     beginning and compare. */
+  else if (_rl_compare_chars (ols, 0, NULL, nls, 0, NULL) == 0)
+#else
+  else if (*ols != *nls)
+#endif
+    {
+      if (*ols)                 /* don't step past the NUL */
+        {
+          if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+            ols = old + _rl_find_next_mbchar (old, ols - old, 1, MB_FIND_ANY);
+          else
+            ols++;
+        }
+      if (*nls)
+        {
+          if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+            nls = new + _rl_find_next_mbchar (new, nls - new, 1, MB_FIND_ANY);
+          else
+            nls++;
+        }
+    }
+
+  /* count of invisible characters in the current invisible line. */
+  current_invis_chars = W_OFFSET (current_line, wrap_offset);
+  if (_rl_last_v_pos != current_line)
+    {
+      _rl_move_vert (current_line);
+      if ((MB_CUR_MAX == 1 || rl_byte_oriented) && current_line == 0 && visible_wrap_offset)
+        _rl_last_c_pos += visible_wrap_offset;
+    }
+
+  /* If this is the first line and there are invisible characters in the
+     prompt string, and the prompt string has not changed, and the current
+     cursor position is before the last invisible character in the prompt,
+     and the index of the character to move to is past the end of the prompt
+     string, then redraw the entire prompt string.  We can only do this
+     reliably if the terminal supports a `cr' capability.
+
+     This is not an efficiency hack -- there is a problem with redrawing
+     portions of the prompt string if they contain terminal escape
+     sequences (like drawing the `unbold' sequence without a corresponding
+     `bold') that manifests itself on certain terminals. */
+
+  lendiff = local_prompt_len;
+  od = ofd - old;       /* index of first difference in visible line */
+  if (current_line == 0 && !_rl_horizontal_scroll_mode &&
+      _rl_term_cr && lendiff > prompt_visible_length && _rl_last_c_pos > 0 &&
+      od >= lendiff && _rl_last_c_pos < PROMPT_ENDING_INDEX)
+    {
+#if defined (__MSDOS__)
+      putc ('\r', rl_outstream);
+#else
+      tputs (_rl_term_cr, 1, _rl_output_character_function);
+#endif
+      _rl_output_some_chars (local_prompt, lendiff);
+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+        {
+          /* We take wrap_offset into account here so we can pass correct
+             information to _rl_move_cursor_relative. */
+          _rl_last_c_pos = _rl_col_width (local_prompt, 0, lendiff) - wrap_offset;
+          cpos_adjusted = 1;
+        }
+      else
+        _rl_last_c_pos = lendiff;
+    }
+
+  o_cpos = _rl_last_c_pos;
+
+  /* When this function returns, _rl_last_c_pos is correct, and an absolute
+     cursor postion in multibyte mode, but a buffer index when not in a
+     multibyte locale. */
+  _rl_move_cursor_relative (od, old);
+#if 1
+#if defined (HANDLE_MULTIBYTE)
+  /* We need to indicate that the cursor position is correct in the presence of
+     invisible characters in the prompt string.  Let's see if setting this when
+     we make sure we're at the end of the drawn prompt string works. */
+  if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && 
+      (_rl_last_c_pos > 0 || o_cpos > 0) &&
+      _rl_last_c_pos == prompt_physical_chars)
+    cpos_adjusted = 1;
+#endif
+#endif
+
+  /* if (len (new) > len (old))
+     lendiff == difference in buffer
+     col_lendiff == difference on screen
+     When not using multibyte characters, these are equal */
+  lendiff = (nls - nfd) - (ols - ofd);
+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+    col_lendiff = _rl_col_width (new, nfd - new, nls - new) - _rl_col_width (old, ofd - old, ols - old);
+  else
+    col_lendiff = lendiff;
+
+  /* If we are changing the number of invisible characters in a line, and
+     the spot of first difference is before the end of the invisible chars,
+     lendiff needs to be adjusted. */
+  if (current_line == 0 && !_rl_horizontal_scroll_mode &&
+      current_invis_chars != visible_wrap_offset)
+    {
+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+        {
+          lendiff += visible_wrap_offset - current_invis_chars;
+          col_lendiff += visible_wrap_offset - current_invis_chars;
+        }
+      else
+        {
+          lendiff += visible_wrap_offset - current_invis_chars;
+          col_lendiff = lendiff;
+        }
+    }
+
+  /* Insert (diff (len (old), len (new)) ch. */
+  temp = ne - nfd;
+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+    col_temp = _rl_col_width (new, nfd - new, ne - new);
+  else
+    col_temp = temp;
+
+  if (col_lendiff > 0)  /* XXX - was lendiff */
+    {
+      /* 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. */
+      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
+             _rl_term_IC or _rl_term_ic will screw up the screen because of the
+             invisible characters.  We need to just draw them. */
+          if (*ols && (!_rl_horizontal_scroll_mode || _rl_last_c_pos > 0 ||
+                        lendiff <= prompt_visible_length || !current_invis_chars))
+            {
+              insert_some_chars (nfd, lendiff, col_lendiff);
+              _rl_last_c_pos += col_lendiff;
+            }
+          else if ((MB_CUR_MAX == 1 || rl_byte_oriented != 0) && *ols == 0 && lendiff > 0)
+            {
+              /* At the end of a line the characters do not have to
+                 be "inserted".  They can just be placed on the screen. */
+              /* However, this screws up the rest of this block, which
+                 assumes you've done the insert because you can. */
+              _rl_output_some_chars (nfd, lendiff);
+              _rl_last_c_pos += col_lendiff;
+            }
+          else
+            {
+              /* We have horizontal scrolling and we are not inserting at
+                 the end.  We have invisible characters in this line.  This
+                 is a dumb update. */
+              _rl_output_some_chars (nfd, temp);
+              _rl_last_c_pos += col_temp;
+              return;
+            }
+          /* Copy (new) chars to screen from first diff to last match. */
+          temp = nls - nfd;
+          if ((temp - lendiff) > 0)
+            {
+              _rl_output_some_chars (nfd + lendiff, temp - lendiff);
+#if 1
+             /* XXX -- this bears closer inspection.  Fixes a redisplay bug
+                reported against bash-3.0-alpha by Andreas Schwab involving
+                multibyte characters and prompt strings with invisible
+                characters, but was previously disabled. */
+              _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
+#else
+              _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff);
+#endif
+            }
+        }
+      else
+        {
+          /* cannot insert chars, write to EOL */
+          _rl_output_some_chars (nfd, temp);
+          _rl_last_c_pos += col_temp;
+          /* If we're in a multibyte locale and were before the last invisible
+             char in the current line (which implies we just output some invisible
+             characters) we need to adjust _rl_last_c_pos, since it represents
+             a physical character position. */
+        }
+    }
+  else                          /* Delete characters from line. */
+    {
+      /* If possible and inexpensive to use terminal deletion, then do so. */
+      if (_rl_term_dc && (2 * col_temp) >= -col_lendiff)
+        {
+          /* If all we're doing is erasing the invisible characters in the
+             prompt string, don't bother.  It screws up the assumptions
+             about what's on the screen. */
+          if (_rl_horizontal_scroll_mode && _rl_last_c_pos == 0 &&
+              -lendiff == visible_wrap_offset)
+            col_lendiff = 0;
+
+          if (col_lendiff)
+            delete_chars (-col_lendiff); /* delete (diff) characters */
+
+          /* Copy (new) chars to screen from first diff to last match */
+          temp = nls - nfd;
+          if (temp > 0)
+            {
+              /* If nfd begins at the prompt, or before the invisible
+                 characters in the prompt, we need to adjust _rl_last_c_pos
+                 in a multibyte locale to account for the wrap offset and
+                 set cpos_adjusted accordingly. */
+              _rl_output_some_chars (nfd, temp);
+              if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+                {
+                  _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
+                  if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
+                    {
+                      _rl_last_c_pos -= wrap_offset;
+                      cpos_adjusted = 1;
+                    }
+                }
+              else
+                _rl_last_c_pos += temp;
+            }
+        }
+      /* Otherwise, print over the existing material. */
+      else
+        {
+          if (temp > 0)
+            {
+              /* If nfd begins at the prompt, or before the invisible
+                 characters in the prompt, we need to adjust _rl_last_c_pos
+                 in a multibyte locale to account for the wrap offset and
+                 set cpos_adjusted accordingly. */
+              _rl_output_some_chars (nfd, temp);
+              _rl_last_c_pos += col_temp;               /* XXX */
+              if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+                {
+                  if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
+                    {
+                      _rl_last_c_pos -= wrap_offset;
+                      cpos_adjusted = 1;
+                    }
+                }
+            }
+          lendiff = (oe - old) - (ne - new);
+          if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+            col_lendiff = _rl_col_width (old, 0, oe - old) - _rl_col_width (new, 0, ne - new);
+          else
+            col_lendiff = lendiff;
+
+          if (col_lendiff)
+            {     
+              if (_rl_term_autowrap && current_line < inv_botlin)
+                space_to_eol (col_lendiff);
+              else
+                _rl_clear_to_eol (col_lendiff);
+            }
+        }
+    }
+}
+
+/* Tell the update routines that we have moved onto a new (empty) line. */
+int
+rl_on_new_line ()
+{
+  if (visible_line)
+    visible_line[0] = '\0';
+
+  _rl_last_c_pos = _rl_last_v_pos = 0;
+  _rl_vis_botlin = last_lmargin = 0;
+  if (vis_lbreaks)
+    vis_lbreaks[0] = vis_lbreaks[1] = 0;
+  visible_wrap_offset = 0;
+  return 0;
+}
+
+/* Tell the update routines that we have moved onto a new line with the
+   prompt already displayed.  Code originally from the version of readline
+   distributed with CLISP.  rl_expand_prompt must have already been called
+   (explicitly or implicitly).  This still doesn't work exactly right. */
+int
+rl_on_new_line_with_prompt ()
+{
+  int prompt_size, i, l, real_screenwidth, newlines;
+  char *prompt_last_line, *lprompt;
+
+  /* Initialize visible_line and invisible_line to ensure that they can hold
+     the already-displayed prompt. */
+  prompt_size = strlen (rl_prompt) + 1;
+  init_line_structures (prompt_size);
+
+  /* Make sure the line structures hold the already-displayed prompt for
+     redisplay. */
+  lprompt = local_prompt ? local_prompt : rl_prompt;
+  strcpy (visible_line, lprompt);
+  strcpy (invisible_line, lprompt);
+
+  /* If the prompt contains newlines, take the last tail. */
+  prompt_last_line = strrchr (rl_prompt, '\n');
+  if (!prompt_last_line)
+    prompt_last_line = rl_prompt;
+
+  l = strlen (prompt_last_line);
+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+    _rl_last_c_pos = _rl_col_width (prompt_last_line, 0, l);    /* XXX */
+  else
+    _rl_last_c_pos = l;
+
+  /* Dissect prompt_last_line into screen lines. Note that here we have
+     to use the real screenwidth. Readline's notion of screenwidth might be
+     one less, see terminal.c. */
+  real_screenwidth = _rl_screenwidth + (_rl_term_autowrap ? 0 : 1);
+  _rl_last_v_pos = l / real_screenwidth;
+  /* If the prompt length is a multiple of real_screenwidth, we don't know
+     whether the cursor is at the end of the last line, or already at the
+     beginning of the next line. Output a newline just to be safe. */
+  if (l > 0 && (l % real_screenwidth) == 0)
+    _rl_output_some_chars ("\n", 1);
+  last_lmargin = 0;
+
+  newlines = 0; i = 0;
+  while (i <= l)
+    {
+      _rl_vis_botlin = newlines;
+      vis_lbreaks[newlines++] = i;
+      i += real_screenwidth;
+    }
+  vis_lbreaks[newlines] = l;
+  visible_wrap_offset = 0;
+
+  rl_display_prompt = rl_prompt;        /* XXX - make sure it's set */
+
+  return 0;
+}
+
+/* Actually update the display, period. */
+int
+rl_forced_update_display ()
+{
+  register char *temp;
+
+  if (visible_line)
+    {
+      temp = visible_line;
+      while (*temp)
+        *temp++ = '\0';
+    }
+  rl_on_new_line ();
+  forced_display++;
+  (*rl_redisplay_function) ();
+  return 0;
+}
+
+/* Move the cursor from _rl_last_c_pos to NEW, which are buffer indices.
+   (Well, when we don't have multibyte characters, _rl_last_c_pos is a
+   buffer index.)
+   DATA is the contents of the screen line of interest; i.e., where
+   the movement is being done. */
+void
+_rl_move_cursor_relative (new, data)
+     int new;
+     const char *data;
+{
+  register int i;
+  int woff;                     /* number of invisible chars on current line */
+  int cpos, dpos;               /* current and desired cursor positions */
+
+  woff = W_OFFSET (_rl_last_v_pos, wrap_offset);
+  cpos = _rl_last_c_pos;
+#if defined (HANDLE_MULTIBYTE)
+  /* If we have multibyte characters, NEW is indexed by the buffer point in
+     a multibyte string, but _rl_last_c_pos is the display position.  In
+     this case, NEW's display position is not obvious and must be
+     calculated.  We need to account for invisible characters in this line,
+     as long as we are past them and they are counted by _rl_col_width. */
+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+    {
+      dpos = _rl_col_width (data, 0, new);
+      /* Use NEW when comparing against the last invisible character in the
+         prompt string, since they're both buffer indices and DPOS is a
+         desired display position. */
+      if (new > prompt_last_invisible)          /* XXX - don't use woff here */
+        {
+          dpos -= woff;
+          /* Since this will be assigned to _rl_last_c_pos at the end (more
+             precisely, _rl_last_c_pos == dpos when this function returns),
+             let the caller know. */
+          cpos_adjusted = 1;
+        }
+    }
+  else
+#endif
+    dpos = new;
+
+  /* If we don't have to do anything, then return. */
+  if (cpos == dpos)
+    return;
+
+  /* It may be faster to output a CR, and then move forwards instead
+     of moving backwards. */
+  /* i == current physical cursor position. */
+#if defined (HANDLE_MULTIBYTE)
+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+    i = _rl_last_c_pos;
+  else
+#endif
+  i = _rl_last_c_pos - woff;
+  if (dpos == 0 || CR_FASTER (dpos, _rl_last_c_pos) ||
+      (_rl_term_autowrap && i == _rl_screenwidth))
+    {
+#if defined (__MSDOS__)
+      putc ('\r', rl_outstream);
+#else
+      tputs (_rl_term_cr, 1, _rl_output_character_function);
+#endif /* !__MSDOS__ */
+      cpos = _rl_last_c_pos = 0;
+    }
+
+  if (cpos < dpos)
+    {
+      /* Move the cursor forward.  We do it by printing the command
+         to move the cursor forward if there is one, else print that
+         portion of the output buffer again.  Which is cheaper? */
+
+      /* The above comment is left here for posterity.  It is faster
+         to print one character (non-control) than to print a control
+         sequence telling the terminal to move forward one character.
+         That kind of control is for people who don't know what the
+         data is underneath the cursor. */
+
+      /* However, we need a handle on where the current display position is
+         in the buffer for the immediately preceding comment to be true.
+         In multibyte locales, we don't currently have that info available.
+         Without it, we don't know where the data we have to display begins
+         in the buffer and we have to go back to the beginning of the screen
+         line.  In this case, we can use the terminal sequence to move forward
+         if it's available. */
+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+        {
+          if (_rl_term_forward_char)
+            {
+              for (i = cpos; i < dpos; i++)
+                tputs (_rl_term_forward_char, 1, _rl_output_character_function);
+            }
+          else
+            {
+              tputs (_rl_term_cr, 1, _rl_output_character_function);
+              for (i = 0; i < new; i++)
+                putc (data[i], rl_outstream);
+            }
+        }
+      else
+        for (i = cpos; i < new; i++)
+          putc (data[i], rl_outstream);
+    }
+
+#if defined (HANDLE_MULTIBYTE)
+  /* NEW points to the buffer point, but _rl_last_c_pos is the display point.
+     The byte length of the string is probably bigger than the column width
+     of the string, which means that if NEW == _rl_last_c_pos, then NEW's
+     display point is less than _rl_last_c_pos. */
+#endif
+  else if (cpos > dpos)
+    _rl_backspace (cpos - dpos);
+
+  _rl_last_c_pos = dpos;
+}
+
+/* PWP: move the cursor up or down. */
+void
+_rl_move_vert (to)
+     int to;
+{
+  register int delta, i;
+
+  if (_rl_last_v_pos == to || to > _rl_screenheight)
+    return;
+
+  if ((delta = to - _rl_last_v_pos) > 0)
+    {
+      for (i = 0; i < delta; i++)
+        putc ('\n', rl_outstream);
+#if defined (__MSDOS__)
+      putc ('\r', rl_outstream);
+#else
+      tputs (_rl_term_cr, 1, _rl_output_character_function);
+#endif
+      _rl_last_c_pos = 0;
+    }
+  else
+    {                   /* delta < 0 */
+      if (_rl_term_up && *_rl_term_up)
+        for (i = 0; i < -delta; i++)
+          tputs (_rl_term_up, 1, _rl_output_character_function);
+    }
+
+  _rl_last_v_pos = to;          /* Now TO is here */
+}
+
+/* Physically print C on rl_outstream.  This is for functions which know
+   how to optimize the display.  Return the number of characters output. */
+int
+rl_show_char (c)
+     int c;
+{
+  int n = 1;
+  if (META_CHAR (c) && (_rl_output_meta_chars == 0))
+    {
+      fprintf (rl_outstream, "M-");
+      n += 2;
+      c = UNMETA (c);
+    }
+
+#if defined (DISPLAY_TABS)
+  if ((CTRL_CHAR (c) && c != '\t') || c == RUBOUT)
+#else
+  if (CTRL_CHAR (c) || c == RUBOUT)
+#endif /* !DISPLAY_TABS */
+    {
+      fprintf (rl_outstream, "C-");
+      n += 2;
+      c = CTRL_CHAR (c) ? UNCTRL (c) : '?';
+    }
+
+  putc (c, rl_outstream);
+  fflush (rl_outstream);
+  return n;
+}
+
+int
+rl_character_len (c, pos)
+     register int c, pos;
+{
+  unsigned char uc;
+
+  uc = (unsigned char)c;
+
+  if (META_CHAR (uc))
+    return ((_rl_output_meta_chars == 0) ? 4 : 1);
+
+  if (uc == '\t')
+    {
+#if defined (DISPLAY_TABS)
+      return (((pos | 7) + 1) - pos);
+#else
+      return (2);
+#endif /* !DISPLAY_TABS */
+    }
+
+  if (CTRL_CHAR (c) || c == RUBOUT)
+    return (2);
+
+  return ((ISPRINT (uc)) ? 1 : 2);
+}
+/* How to print things in the "echo-area".  The prompt is treated as a
+   mini-modeline. */
+static int msg_saved_prompt = 0;
+
+#if defined (USE_VARARGS)
+int
+#if defined (PREFER_STDARG)
+rl_message (const char *format, ...)
+#else
+rl_message (va_alist)
+     va_dcl
+#endif
+{
+  va_list args;
+#if defined (PREFER_VARARGS)
+  char *format;
+#endif
+
+#if defined (PREFER_STDARG)
+  va_start (args, format);
+#else
+  va_start (args);
+  format = va_arg (args, char *);
+#endif
+
+#if defined (HAVE_VSNPRINTF)
+  vsnprintf (msg_buf, sizeof (msg_buf) - 1, format, args);
+#else
+  vsprintf (msg_buf, format, args);
+  msg_buf[sizeof(msg_buf) - 1] = '\0';  /* overflow? */
+#endif
+  va_end (args);
+
+  if (saved_local_prompt == 0)
+    {
+      rl_save_prompt ();
+      msg_saved_prompt = 1;
+    }
+  rl_display_prompt = msg_buf;
+  local_prompt = expand_prompt (msg_buf, &prompt_visible_length,
+                                         &prompt_last_invisible,
+                                         &prompt_invis_chars_first_line,
+                                         &prompt_physical_chars);
+  local_prompt_prefix = (char *)NULL;
+  local_prompt_len = local_prompt ? strlen (local_prompt) : 0;
+  (*rl_redisplay_function) ();
+
+  return 0;
+}
+#else /* !USE_VARARGS */
+int
+rl_message (format, arg1, arg2)
+     char *format;
+{
+  sprintf (msg_buf, format, arg1, arg2);
+  msg_buf[sizeof(msg_buf) - 1] = '\0';  /* overflow? */
+
+  rl_display_prompt = msg_buf;
+  if (saved_local_prompt == 0)
+    {
+      rl_save_prompt ();
+      msg_saved_prompt = 1;
+    }
+  local_prompt = expand_prompt (msg_buf, &prompt_visible_length,
+                                         &prompt_last_invisible,
+                                         &prompt_invis_chars_first_line,
+                                         &prompt_physical_chars);
+  local_prompt_prefix = (char *)NULL;
+  local_prompt_len = local_prompt ? strlen (local_prompt) : 0;
+  (*rl_redisplay_function) ();
+      
+  return 0;
+}
+#endif /* !USE_VARARGS */
+
+/* How to clear things from the "echo-area". */
+int
+rl_clear_message ()
+{
+  rl_display_prompt = rl_prompt;
+  if (msg_saved_prompt)
+    {
+      rl_restore_prompt ();
+      msg_saved_prompt = 0;
+    }
+  (*rl_redisplay_function) ();
+  return 0;
+}
+
+int
+rl_reset_line_state ()
+{
+  rl_on_new_line ();
+
+  rl_display_prompt = rl_prompt ? rl_prompt : "";
+  forced_display = 1;
+  return 0;
+}
+
+void
+rl_save_prompt ()
+{
+  saved_local_prompt = local_prompt;
+  saved_local_prefix = local_prompt_prefix;
+  saved_prefix_length = prompt_prefix_length;
+  saved_local_length = local_prompt_len;
+  saved_last_invisible = prompt_last_invisible;
+  saved_visible_length = prompt_visible_length;
+  saved_invis_chars_first_line = prompt_invis_chars_first_line;
+  saved_physical_chars = prompt_physical_chars;
+
+  local_prompt = local_prompt_prefix = (char *)0;
+  local_prompt_len = 0;
+  prompt_last_invisible = prompt_visible_length = prompt_prefix_length = 0;
+  prompt_invis_chars_first_line = prompt_physical_chars = 0;
+}
+
+void
+rl_restore_prompt ()
+{
+  FREE (local_prompt);
+  FREE (local_prompt_prefix);
+
+  local_prompt = saved_local_prompt;
+  local_prompt_prefix = saved_local_prefix;
+  local_prompt_len = saved_local_length;
+  prompt_prefix_length = saved_prefix_length;
+  prompt_last_invisible = saved_last_invisible;
+  prompt_visible_length = saved_visible_length;
+  prompt_invis_chars_first_line = saved_invis_chars_first_line;
+  prompt_physical_chars = saved_physical_chars;
+
+  /* can test saved_local_prompt to see if prompt info has been saved. */
+  saved_local_prompt = saved_local_prefix = (char *)0;
+  saved_local_length = 0;
+  saved_last_invisible = saved_visible_length = saved_prefix_length = 0;
+  saved_invis_chars_first_line = saved_physical_chars = 0;
+}
+
+char *
+_rl_make_prompt_for_search (pchar)
+     int pchar;
+{
+  int len;
+  char *pmt, *p;
+
+  rl_save_prompt ();
+
+  /* We've saved the prompt, and can do anything with the various prompt
+     strings we need before they're restored.  We want the unexpanded
+     portion of the prompt string after any final newline. */
+  p = rl_prompt ? strrchr (rl_prompt, '\n') : 0;
+  if (p == 0)
+    {
+      len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0;
+      pmt = (char *)xmalloc (len + 2);
+      if (len)
+        strcpy (pmt, rl_prompt);
+      pmt[len] = pchar;
+      pmt[len+1] = '\0';
+    }
+  else
+    {
+      p++;
+      len = strlen (p);
+      pmt = (char *)xmalloc (len + 2);
+      if (len)
+        strcpy (pmt, p);
+      pmt[len] = pchar;
+      pmt[len+1] = '\0';
+    }  
+
+  /* will be overwritten by expand_prompt, called from rl_message */
+  prompt_physical_chars = saved_physical_chars + 1;
+  return pmt;
+}
+
+/* Quick redisplay hack when erasing characters at the end of the line. */
+void
+_rl_erase_at_end_of_line (l)
+     int l;
+{
+  register int i;
+
+  _rl_backspace (l);
+  for (i = 0; i < l; i++)
+    putc (' ', rl_outstream);
+  _rl_backspace (l);
+  for (i = 0; i < l; i++)
+    visible_line[--_rl_last_c_pos] = '\0';
+  rl_display_fixed++;
+}
+
+/* Clear to the end of the line.  COUNT is the minimum
+   number of character spaces to clear, */
+void
+_rl_clear_to_eol (count)
+     int count;
+{
+  if (_rl_term_clreol)
+    tputs (_rl_term_clreol, 1, _rl_output_character_function);
+  else if (count)
+    space_to_eol (count);
+}
+
+/* Clear to the end of the line using spaces.  COUNT is the minimum
+   number of character spaces to clear, */
+static void
+space_to_eol (count)
+     int count;
+{
+  register int i;
+
+  for (i = 0; i < count; i++)
+   putc (' ', rl_outstream);
+
+  _rl_last_c_pos += count;
+}
+
+void
+_rl_clear_screen ()
+{
+  if (_rl_term_clrpag)
+    tputs (_rl_term_clrpag, 1, _rl_output_character_function);
+  else
+    rl_crlf ();
+}
+
+/* Insert COUNT characters from STRING to the output stream at column COL. */
+static void
+insert_some_chars (string, count, col)
+     char *string;
+     int count, col;
+{
+#if defined (__MSDOS__) || defined (__MINGW32__)
+  _rl_output_some_chars (string, count);
+#else
+  /* DEBUGGING */
+  if (MB_CUR_MAX == 1 || rl_byte_oriented)
+    if (count != col)
+      fprintf(stderr, "readline: debug: insert_some_chars: count (%d) != col (%d)\n", count, col);
+
+  /* If IC is defined, then we do not have to "enter" insert mode. */
+  if (_rl_term_IC)
+    {
+      char *buffer;
+
+      buffer = tgoto (_rl_term_IC, 0, col);
+      tputs (buffer, 1, _rl_output_character_function);
+      _rl_output_some_chars (string, count);
+    }
+  else
+    {
+      register int i;
+
+      /* If we have to turn on insert-mode, then do so. */
+      if (_rl_term_im && *_rl_term_im)
+        tputs (_rl_term_im, 1, _rl_output_character_function);
+
+      /* If there is a special command for inserting characters, then
+         use that first to open up the space. */
+      if (_rl_term_ic && *_rl_term_ic)
+        {
+          for (i = col; i--; )
+            tputs (_rl_term_ic, 1, _rl_output_character_function);
+        }
+
+      /* Print the text. */
+      _rl_output_some_chars (string, count);
+
+      /* If there is a string to turn off insert mode, we had best use
+         it now. */
+      if (_rl_term_ei && *_rl_term_ei)
+        tputs (_rl_term_ei, 1, _rl_output_character_function);
+    }
+#endif /* __MSDOS__ || __MINGW32__ */
+}
+
+/* Delete COUNT characters from the display line. */
+static void
+delete_chars (count)
+     int count;
+{
+  if (count > _rl_screenwidth)  /* XXX */
+    return;
+
+#if !defined (__MSDOS__) && !defined (__MINGW32__)
+  if (_rl_term_DC && *_rl_term_DC)
+    {
+      char *buffer;
+      buffer = tgoto (_rl_term_DC, count, count);
+      tputs (buffer, count, _rl_output_character_function);
+    }
+  else
+    {
+      if (_rl_term_dc && *_rl_term_dc)
+        while (count--)
+          tputs (_rl_term_dc, 1, _rl_output_character_function);
+    }
+#endif /* !__MSDOS__ && !__MINGW32__ */
+}
+
+void
+_rl_update_final ()
+{
+  int full_lines;
+
+  full_lines = 0;
+  /* If the cursor is the only thing on an otherwise-blank last line,
+     compensate so we don't print an extra CRLF. */
+  if (_rl_vis_botlin && _rl_last_c_pos == 0 &&
+        visible_line[vis_lbreaks[_rl_vis_botlin]] == 0)
+    {
+      _rl_vis_botlin--;
+      full_lines = 1;
+    }
+  _rl_move_vert (_rl_vis_botlin);
+  /* If we've wrapped lines, remove the final xterm line-wrap flag. */
+  if (full_lines && _rl_term_autowrap && (VIS_LLEN(_rl_vis_botlin) == _rl_screenwidth))
+    {
+      char *last_line;
+
+      last_line = &visible_line[vis_lbreaks[_rl_vis_botlin]];
+      cpos_buffer_position = -1;        /* don't know where we are in buffer */
+      _rl_move_cursor_relative (_rl_screenwidth - 1, last_line);        /* XXX */
+      _rl_clear_to_eol (0);
+      putc (last_line[_rl_screenwidth - 1], rl_outstream);
+    }
+  _rl_vis_botlin = 0;
+  rl_crlf ();
+  fflush (rl_outstream);
+  rl_display_fixed++;
+}
+
+/* Move to the start of the current line. */
+static void
+cr ()
+{
+  if (_rl_term_cr)
+    {
+#if defined (__MSDOS__)
+      putc ('\r', rl_outstream);
+#else
+      tputs (_rl_term_cr, 1, _rl_output_character_function);
+#endif
+      _rl_last_c_pos = 0;
+    }
+}
+
+/* Redraw the last line of a multi-line prompt that may possibly contain
+   terminal escape sequences.  Called with the cursor at column 0 of the
+   line to draw the prompt on. */
+static void
+redraw_prompt (t)
+     char *t;
+{
+  char *oldp;
+
+  oldp = rl_display_prompt;
+  rl_save_prompt ();
+
+  rl_display_prompt = t;
+  local_prompt = expand_prompt (t, &prompt_visible_length,
+                                   &prompt_last_invisible,
+                                   &prompt_invis_chars_first_line,
+                                   &prompt_physical_chars);
+  local_prompt_prefix = (char *)NULL;
+  local_prompt_len = local_prompt ? strlen (local_prompt) : 0;
+
+  rl_forced_update_display ();
+
+  rl_display_prompt = oldp;
+  rl_restore_prompt();
+}
+      
+/* Redisplay the current line after a SIGWINCH is received. */
+void
+_rl_redisplay_after_sigwinch ()
+{
+  char *t;
+
+  /* Clear the current line and put the cursor at column 0.  Make sure
+     the right thing happens if we have wrapped to a new screen line. */
+  if (_rl_term_cr)
+    {
+#if defined (__MSDOS__)
+      putc ('\r', rl_outstream);
+#else
+      tputs (_rl_term_cr, 1, _rl_output_character_function);
+#endif
+      _rl_last_c_pos = 0;
+#if defined (__MSDOS__)
+      space_to_eol (_rl_screenwidth);
+      putc ('\r', rl_outstream);
+#else
+      if (_rl_term_clreol)
+        tputs (_rl_term_clreol, 1, _rl_output_character_function);
+      else
+        {
+          space_to_eol (_rl_screenwidth);
+          tputs (_rl_term_cr, 1, _rl_output_character_function);
+        }
+#endif
+      if (_rl_last_v_pos > 0)
+        _rl_move_vert (0);
+    }
+  else
+    rl_crlf ();
+
+  /* Redraw only the last line of a multi-line prompt. */
+  t = strrchr (rl_display_prompt, '\n');
+  if (t)
+    redraw_prompt (++t);
+  else
+    rl_forced_update_display ();
+}
+
+void
+_rl_clean_up_for_exit ()
+{
+  if (readline_echoing_p)
+    {
+      _rl_move_vert (_rl_vis_botlin);
+      _rl_vis_botlin = 0;
+      fflush (rl_outstream);
+      rl_restart_output (1, 0);
+    }
+}
+
+void
+_rl_erase_entire_line ()
+{
+  cr ();
+  _rl_clear_to_eol (0);
+  cr ();
+  fflush (rl_outstream);
+}
+
+/* return the `current display line' of the cursor -- the number of lines to
+   move up to get to the first screen line of the current readline line. */
+int
+_rl_current_display_line ()
+{
+  int ret, nleft;
+
+  /* Find out whether or not there might be invisible characters in the
+     editing buffer. */
+  if (rl_display_prompt == rl_prompt)
+    nleft = _rl_last_c_pos - _rl_screenwidth - rl_visible_prompt_length;
+  else
+    nleft = _rl_last_c_pos - _rl_screenwidth;
+
+  if (nleft > 0)
+    ret = 1 + nleft / _rl_screenwidth;
+  else
+    ret = 0;
+
+  return ret;
+}
+
+#if defined (HANDLE_MULTIBYTE)
+/* Calculate the number of screen columns occupied by STR from START to END.
+   In the case of multibyte characters with stateful encoding, we have to
+   scan from the beginning of the string to take the state into account. */
+static int
+_rl_col_width (str, start, end)
+     const char *str;
+     int start, end;
+{
+  wchar_t wc;
+  mbstate_t ps;
+  int tmp, point, width, max;
+
+  if (end <= start)
+    return 0;
+  if (MB_CUR_MAX == 1 || rl_byte_oriented)
+    return (end - start);
+
+  memset (&ps, 0, sizeof (mbstate_t));
+
+  point = 0;
+  max = end;
+
+  while (point < start)
+    {
+      tmp = mbrlen (str + point, max, &ps);
+      if (MB_INVALIDCH ((size_t)tmp))
+        {
+          /* In this case, the bytes are invalid or too short to compose a
+             multibyte character, so we assume that the first byte represents
+             a single character. */
+          point++;
+          max--;
+
+          /* Clear the state of the byte sequence, because in this case the
+             effect of mbstate is undefined. */
+          memset (&ps, 0, sizeof (mbstate_t));
+        }
+      else if (MB_NULLWCH (tmp))
+        break;          /* Found '\0' */
+      else
+        {
+          point += tmp;
+          max -= tmp;
+        }
+    }
+
+  /* If START is not a byte that starts a character, then POINT will be
+     greater than START.  In this case, assume that (POINT - START) gives
+     a byte count that is the number of columns of difference. */
+  width = point - start;
+
+  while (point < end)
+    {
+      tmp = mbrtowc (&wc, str + point, max, &ps);
+      if (MB_INVALIDCH ((size_t)tmp))
+        {
+          /* In this case, the bytes are invalid or too short to compose a
+             multibyte character, so we assume that the first byte represents
+             a single character. */
+          point++;
+          max--;
+
+          /* and assume that the byte occupies a single column. */
+          width++;
+
+          /* Clear the state of the byte sequence, because in this case the
+             effect of mbstate is undefined. */
+          memset (&ps, 0, sizeof (mbstate_t));
+        }
+      else if (MB_NULLWCH (tmp))
+        break;                  /* Found '\0' */
+      else
+        {
+          point += tmp;
+          max -= tmp;
+          tmp = wcwidth(wc);
+          width += (tmp >= 0) ? tmp : 1;
+        }
+    }
+
+  width += point - end;
+
+  return width;
+}
+#endif /* HANDLE_MULTIBYTE */

lib/readline/input.c

@@ -133 +133 @@
     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);
@@ -151 +154 @@
     {
       pop_index--;
       if (pop_index < 0)
-        pop_index = ibuffer_len - 1;
+        pop_index = ibuffer_len;
       ibuffer[pop_index] = key;
       return (1);
     }
@@ -250 +253 @@
       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 +377 @@
       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 +521 @@
      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 +578 @@
 
   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));

lib/readline/isearch.c

@@ -327 +327 @@
   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;

lib/readline/misc.c

@@ -146 +146 @@
           rl_restore_prompt ();
           rl_clear_message ();
           RL_UNSETSTATE(RL_STATE_NUMERICARG);
+          if (key < 0)
+            return -1;
           return (_rl_dispatch (key, _rl_keymap));
         }
     }

lib/readline/readline.c

@@ -645 +645 @@
   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;
     }

lib/readline/text.c

@@ -857 +857 @@
   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 +1523 @@
 
   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 +1542 @@
   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

lib/readline/vi_mode.c

@@ -886 +886 @@
   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 +909 @@
           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 +1236 @@
 _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 +1267 @@
 rl_vi_char_search (count, key)
      int count, key;
 {
+  int c;
 #if defined (HANDLE_MULTIBYTE)
   static char *target;
   static int tlen;
@@ -1293 +1314 @@
       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 +1494 @@
   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 +1515 @@
 
   _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 +1549 @@
   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 +1686 @@
   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 +1738 @@
       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;

lib/sh/snprintf.c

@@ -471 +471 @@
           10^x ~= r
  * log_10(200) = 2;
  * log_10(250) = 2;
+ *
+ * NOTE: do not call this with r == 0 -- an infinite loop results.
  */
 static int
 log_10(r)
@@ -576 +578 @@
     { 
       integral_part[0] = '0';
       integral_part[1] = '\0';
-      fraction_part[0] = '0';
-      fraction_part[1] = '\0';
+      /* The fractional part has to take the precision into account */
+      for (ch = 0; ch < precision-1; ch++)
+        fraction_part[ch] = '0';
+      fraction_part[ch] = '0';
+      fraction_part[ch+1] = '\0';
       if (fract)
         *fract = fraction_part;
       return integral_part;
@@ -663 +668 @@
     p->flags &= ~PF_ZEROPAD;
 
   sd = d;       /* signed for ' ' padding in base 10 */
-  flags = (*p->pf == 'u' || *p->pf == 'U') ? FL_UNSIGNED : 0;
+  flags = 0;
+  flags = (*p->pf == 'x' || *p->pf == 'X' || *p->pf == 'o' || *p->pf == 'u' || *p->pf == 'U') ? FL_UNSIGNED : 0;
   if (*p->pf == 'X')
     flags |= FL_HEXUPPER;
 
@@ -733 +739 @@
     p->flags &= ~PF_ZEROPAD;
 
   sd = d;       /* signed for ' ' padding in base 10 */
-  flags = (*p->pf == 'u' || *p->pf == 'U') ? FL_UNSIGNED : 0;
+  flags = (*p->pf == 'x' || *p->pf == 'X' || *p->pf == 'o' || *p->pf == 'u' || *p->pf == 'U') ? FL_UNSIGNED : 0;
   if (*p->pf == 'X')
     flags |= FL_HEXUPPER;
 
@@ -805 +811 @@
       PUT_CHAR(*tmp, p);
       tmp++;
     }
+
   PAD_LEFT(p);
 }
 
@@ -972 +979 @@
   if ((p->flags & PF_THOUSANDS) && grouping && (t = groupnum (tmp)))
     tmp = t;
 
+  if ((*p->pf == 'g' || *p->pf == 'G') && (p->flags & PF_ALTFORM) == 0)
+    {
+      /* smash the trailing zeros unless altform */
+      for (i = strlen(tmp2) - 1; i >= 0 && tmp2[i] == '0'; i--)
+        tmp2[i] = '\0'; 
+      if (tmp2[0] == '\0')
+        p->precision = 0;
+    }
+
   /* calculate the padding. 1 for the dot */
   p->width = p->width -
             ((d > 0. && p->justify == RIGHT) ? 1:0) -
             ((p->flags & PF_SPACE) ? 1:0) -
-            strlen(tmp) - p->precision - 1;
+            strlen(tmp) - p->precision -
+            ((p->precision != 0 || (p->flags & PF_ALTFORM)) ? 1 : 0);   /* radix char */
   PAD_RIGHT(p);  
   PUT_PLUS(d, p, 0.);
   PUT_SPACE(d, p, 0.);
@@ -991 +1008 @@
   if (p->precision != 0 || (p->flags & PF_ALTFORM))
     PUT_CHAR(decpoint, p);  /* put the '.' */
 
-  if ((*p->pf == 'g' || *p->pf == 'G') && (p->flags & PF_ALTFORM) == 0)
-    /* smash the trailing zeros unless altform */
-    for (i = strlen(tmp2) - 1; i >= 0 && tmp2[i] == '0'; i--)
-      tmp2[i] = '\0'; 
-
   for (; *tmp2; tmp2++)
     PUT_CHAR(*tmp2, p); /* the fraction */
   
@@ -1011 +1023 @@
   char *tmp, *tmp2;
   int j, i;
 
-  if (chkinfnan(p, d, 1) || chkinfnan(p, d, 2))
+  if (d != 0 && (chkinfnan(p, d, 1) || chkinfnan(p, d, 2)))
     return;     /* already printed nan or inf */
 
   GETLOCALEDATA(decpoint, thoussep, grouping);
   DEF_PREC(p);
-  j = log_10(d);
-  d = d / pow_10(j);  /* get the Mantissa */
-  d = ROUND(d, p);                
+  if (d == 0.)
+    j = 0;
+  else
+    {
+      j = log_10(d);
+      d = d / pow_10(j);  /* get the Mantissa */
+      d = ROUND(d, p);            
+    }
   tmp = dtoa(d, p->precision, &tmp2);
 
   /* 1 for unit, 1 for the '.', 1 for 'e|E',
@@ -1076 +1093 @@
        PUT_CHAR(*tmp, p);
        tmp++;
      }
+
    PAD_LEFT(p);
 }
 #endif
@@ -1358 +1376 @@
                 STAR_ARGS(data);
                 DEF_PREC(data);
                 d = GETDOUBLE(data);
-                i = log_10(d);
+                i = (d != 0.) ? log_10(d) : -1;
                 /*
                  * for '%g|%G' ANSI: use f if exponent
                  * is in the range or [-4,p] exclusively

parse.y

@@ -1029 +1029 @@
 #define PST_CMDTOKEN    0x1000          /* command token OK - unused */
 #define PST_COMPASSIGN  0x2000          /* parsing x=(...) compound assignment */
 #define PST_ASSIGNOK    0x4000          /* assignment statement ok in this context */
+#define PST_REGEXP      0x8000          /* parsing an ERE/BRE as a single word */
 
 /* Initial size to allocate for tokens, and the
    amount to grow them by. */
@@ -2591 +2592 @@
       return (character);
     }
 
+  if (parser_state & PST_REGEXP)
+    goto tokword;
+
   /* Shell meta-characters. */
   if MBTEST(shellmeta (character) && ((parser_state & PST_DBLPAREN) == 0))
     {
@@ -2698 +2702 @@
   if MBTEST(character == '-' && (last_read_token == LESS_AND || last_read_token == GREATER_AND))
     return (character);
 
+tokword:
   /* Okay, if we got this far, we have to read a word.  Read one,
      and then check it against the known ones. */
   result = read_token_word (character);
@@ -2735 +2740 @@
 /* itrace("parse_matched_pair: open = %c close = %c", open, close); */
   count = 1;
   pass_next_character = backq_backslash = was_dollar = in_comment = 0;
-  check_comment = (flags & P_COMMAND) && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0;
+  check_comment = (flags & P_COMMAND) && qc != '`' && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0;
 
   /* RFLAGS is the set of flags we want to pass to recursive calls. */
   rflags = (qc == '"') ? P_DQUOTE : (flags & P_DQUOTE);
@@ -3202 +3207 @@
       if (tok == WORD && test_binop (yylval.word->word))
         op = yylval.word;
 #if defined (COND_REGEXP)
-      else if (tok == WORD && STREQ (yylval.word->word,"=~"))
-        op = yylval.word;
+      else if (tok == WORD && STREQ (yylval.word->word, "=~"))
+        {
+          op = yylval.word;
+          parser_state |= PST_REGEXP;
+        }
 #endif
       else if (tok == '<' || tok == '>')
         op = make_word_from_token (tok);  /* ( */
@@ -3234 +3242 @@
 
       /* rhs */
       tok = read_token (READ);
+      parser_state &= ~PST_REGEXP;
       if (tok == WORD)
         {
           tright = make_cond_node (COND_TERM, yylval.word, (COND_COM *)NULL, (COND_COM *)NULL);
@@ -3367 +3376 @@
       if (pass_next_character)
         {
           pass_next_character = 0;
-          goto got_character;
+          goto got_escaped_character;
         }
 
       cd = current_delimiter (dstack);
@@ -3419 +3428 @@
           goto next_character;
         }
 
+#ifdef COND_REGEXP
+      /* When parsing a regexp as a single word inside a conditional command,
+         we need to special-case characters special to both the shell and
+         regular expressions.  Right now, that is only '(' and '|'. */ /*)*/
+      if MBTEST((parser_state & PST_REGEXP) && (character == '(' || character == '|'))          /*)*/
+        {
+          if (character == '|')
+            goto got_character;
+
+          push_delimiter (dstack, character);
+          ttok = parse_matched_pair (cd, '(', ')', &ttoklen, 0);
+          pop_delimiter (dstack);
+          if (ttok == &matched_pair_error)
+            return -1;          /* Bail immediately. */
+          RESIZE_MALLOCED_BUFFER (token, token_index, ttoklen + 2,
+                                  token_buffer_size, TOKEN_DEFAULT_GROW_SIZE);
+          token[token_index++] = character;
+          strcpy (token + token_index, ttok);
+          token_index += ttoklen;
+          FREE (ttok);
+          dollar_present = all_digit_token = 0;
+          goto next_character;
+        }
+#endif /* COND_REGEXP */
+
 #ifdef EXTENDED_GLOB
       /* Parse a ksh-style extended pattern matching specification. */
-      if (extended_glob && PATTERN_CHAR (character))
+      if MBTEST(extended_glob && PATTERN_CHAR (character))
         {
           peek_char = shell_getc (1);
           if MBTEST(peek_char == '(')           /* ) */
@@ -3616 +3650 @@
 
     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,

patchlevel.h

@@ -25 +25 @@
    regexp `^#define[    ]*PATCHLEVEL', since that's what support/mkversion.sh
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 0
+#define PATCHLEVEL 33
 
 #endif /* _PATCHLEVEL_H_ */

pathexp.c

@@ -1 +1 @@
 /* pathexp.c -- The shell interface to the globbing library. */
 
-/* Copyright (C) 1995-2002 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2007 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -110 +110 @@
   return (0);
 }
 
+/* Return 1 if C is a character that is `special' in a POSIX ERE and needs to
+   be quoted to match itself. */
+static inline int
+ere_char (c)
+     int c;
+{
+  switch (c)
+    {
+    case '.':
+    case '[':
+    case '\\':
+    case '(':
+    case ')':
+    case '*':
+    case '+':
+    case '?':
+    case '{':
+    case '|':
+    case '^':
+    case '$':
+      return 1;
+    default: 
+      return 0;
+    }
+  return (0);
+}
+
 /* PATHNAME can contain characters prefixed by CTLESC; this indicates
    that the character is to be quoted.  We quote it here in the style
    that the glob library recognizes.  If flags includes QGLOB_CVTNULL,
@@ -142 +169 @@
         {
           if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/')
             continue;
+          if ((qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0)
+            continue;
           temp[j++] = '\\';
           i++;
           if (pathname[i] == '\0')

pathexp.h

@@ -1 +1 @@
 /* pathexp.h -- The shell interface to the globbing library. */
 
-/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2007 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -32 +32 @@
 /* Flag values for quote_string_for_globbing */
 #define QGLOB_CVTNULL   0x01    /* convert QUOTED_NULL strings to '\0' */
 #define QGLOB_FILENAME  0x02    /* do correct quoting for matching filenames */
+#define QGLOB_REGEXP    0x04    /* quote an ERE for regcomp/regexec */
 
 #if defined (EXTENDED_GLOB)
 /* Flags to OR with other flag args to strmatch() to enabled the extended

po/ru.po

@@ -12 +12 @@
 "Last-Translator: Evgeniy Dushistov <dushistov@mail.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
 

bash-3.2

@@ -350 +350 @@
 #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 ()

bash-3.2

@@ -121 +121 @@
 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__));
 

subst.c

@@ -4 +4 @@
 /* ``Have a little faith, there's magic in the night.  You ain't a
      beauty, but, hey, you're alright.'' */
 
-/* Copyright (C) 1987-2006 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2007 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -1278 +1278 @@
     {
       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 +1887 @@
   sep[1] = '\0';
 #endif
 
+  /* XXX -- why call quote_list if ifs == 0?  we can get away without doing
+     it now that quote_escapes quotes spaces */
+#if 0
   tlist = ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) || (ifs && *ifs == 0))
+#else
+  tlist = (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
+#endif
                 ? quote_list (list)
                 : list_quote_escapes (list);
 
@@ -2646 +2652 @@
 
 /* This needs better error handling. */
 /* Expand W for use as an argument to a unary or binary operator in a
-   [[...]] expression.  If SPECIAL is nonzero, this is the rhs argument
+   [[...]] expression.  If SPECIAL is 1, this is the rhs argument
    to the != or == operator, and should be treated as a pattern.  In
-   this case, we quote the string specially for the globbing code.  The
-   caller is responsible for removing the backslashes if the unquoted
-   words is needed later. */   
+   this case, we quote the string specially for the globbing code.  If
+   SPECIAL is 2, this is an rhs argument for the =~ operator, and should
+   be quoted appropriately for regcomp/regexec.  The caller is responsible
+   for removing the backslashes if the unquoted word is needed later. */   
 char *
 cond_expand_word (w, special)
      WORD_DESC *w;
@@ -2658 +2665 @@
 {
   char *r, *p;
   WORD_LIST *l;
+  int qflags;
 
   if (w->word == 0 || w->word[0] == '\0')
     return ((char *)NULL);
@@ -2672 +2680 @@
         }
       else
         {
+          qflags = QGLOB_CVTNULL;
+          if (special == 2)
+            qflags |= QGLOB_REGEXP;
           p = string_list (l);
-          r = quote_string_for_globbing (p, QGLOB_CVTNULL);
+          r = quote_string_for_globbing (p, qflags);
           free (p);
         }
       dispose_words (l);
@@ -2916 +2927 @@
 
 /* Quote escape characters in string s, but no other characters.  This is
    used to protect CTLESC and CTLNUL in variable values from the rest of
-   the word expansion process after the variable is expanded. */
+   the word expansion process after the variable is expanded.  If IFS is
+   null, we quote spaces as well, just in case we split on spaces later
+   (in the case of unquoted $@, we will eventually attempt to split the
+   entire word on spaces).  Corresponding code exists in dequote_escapes.
+   Even if we don't end up splitting on spaces, quoting spaces is not a
+   problem. */
 char *
 quote_escapes (string)
      char *string;
@@ -2924 +2940 @@
   register char *s, *t;
   size_t slen;
   char *result, *send;
+  int quote_spaces;
   DECLARE_MBSTATE; 
 
   slen = strlen (string);
   send = string + slen;
 
+  quote_spaces = (ifs_value && *ifs_value == 0);
   t = result = (char *)xmalloc ((slen * 2) + 1);
   s = string;
 
   while (*s)
     {
-      if (*s == CTLESC || *s == CTLNUL)
+      if (*s == CTLESC || *s == CTLNUL || (quote_spaces && *s == ' '))
         *t++ = CTLESC;
       COPY_CHAR_P (t, s, send);
     }
@@ -2976 +2994 @@
   register char *s, *t;
   size_t slen;
   char *result, *send;
+  int quote_spaces;
   DECLARE_MBSTATE;
 
   if (string == 0)
@@ -2990 +3009 @@
   if (strchr (string, CTLESC) == 0)
     return (strcpy (result, s));
 
+  quote_spaces = (ifs_value && *ifs_value == 0);
   while (*s)
     {
-      if (*s == CTLESC && (s[1] == CTLESC || s[1] == CTLNUL))
+      if (*s == CTLESC && (s[1] == CTLESC || s[1] == CTLNUL || (quote_spaces && s[1] == ' ')))
         {
           s++;
           if (*s == '\0')
@@ -3954 +3974 @@
   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 +4147 @@
     nfifo = 0;
 }
 
+int
+fifos_pending ()
+{
+  return nfifo;
+}
+
 static char *
 make_named_pipe ()
 {
@@ -4172 +4202 @@
   nfds++;
 }
 
+int
+fifos_pending ()
+{
+  return 0;     /* used for cleanup; not needed with /dev/fd */
+}
+
 void
 unlink_fifo_list ()
 {
@@ -4456 +4492 @@
       /* Add the character to ISTRING, possibly after resizing it. */
       RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE);
 
-      if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) || c == CTLESC || c == CTLNUL)
+      /* This is essentially quote_string inline */
+      if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) /* || c == CTLESC || c == CTLNUL */)
+        istring[istring_index++] = CTLESC;
+      /* Escape CTLESC and CTLNUL in the output to protect those characters
+         from the rest of the word expansions (word splitting and globbing.)
+         This is essentially quote_escapes inline. */
+      else if (c == CTLESC)
+        istring[istring_index++] = CTLESC;
+      else if (c == CTLNUL || (c == ' ' && (ifs_value && *ifs_value == 0)))
         istring[istring_index++] = CTLESC;
 
       istring[istring_index++] = c;
@@ -4665 +4709 @@
 
       last_command_exit_value = rc;
       rc = run_exit_trap ();
+#if defined (PROCESS_SUBSTITUTION)
+      unlink_fifo_list ();
+#endif
       exit (rc);
     }
   else
@@ -4860 +4907 @@
   char *temp, *tt;
   intmax_t arg_index;
   SHELL_VAR *var;
-  int atype;
+  int atype, rflags;
 
   ret = 0;
   temp = 0;
+  rflags = 0;
 
   /* Handle multiple digit arguments, as in ${11}. */  
   if (legal_number (name, &arg_index))
@@ -4896 +4944 @@
         temp = (*temp && (quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)))
                   ? quote_string (temp)
                   : quote_escapes (temp);
+      else if (atype == 1 && temp && QUOTED_NULL (temp) && (quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)))
+        rflags |= W_HASQUOTEDNULL;
     }
 #endif
   else if (var = find_variable (name))
@@ -4923 +4973 @@
     {
       ret = alloc_word_desc ();
       ret->word = temp;
+      ret->flags |= rflags;
     }
   return ret;
 }
@@ -5546 +5597 @@
          so verify_substring_values just returns the numbers specified and we
          rely on array_subrange to understand how to deal with them). */
       tt = array_subrange (array_cell (v), e1, e2, starsub, quoted);
+#if 0
+      /* array_subrange now calls array_quote_escapes as appropriate, so the
+         caller no longer needs to. */
       if ((quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)) == 0)
         {
           temp = tt ? quote_escapes (tt) : (char *)NULL;
           FREE (tt);
         }
       else
+#endif
         temp = tt;
       break;
 #endif
@@ -5707 +5762 @@
   vtype &= ~VT_STARSUB;
 
   mflags = 0;
+  if (patsub && *patsub == '/')
+    {
+      mflags |= MATCH_GLOBREP;
+      patsub++;
+    }
 
   /* 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 +5801 @@
     }
 
   /* ksh93 doesn't allow the match specifier to be a part of the expanded
-     pattern.  This is an extension. */
+     pattern.  This is an extension.  Make sure we don't anchor the pattern
+     at the beginning or end of the string if we're doing global replacement,
+     though. */
   p = pat;
-  if (pat && pat[0] == '/')
-    {
-      mflags |= MATCH_GLOBREP|MATCH_ANY;
-      p++;
-    }
+  if (mflags & MATCH_GLOBREP)
+    mflags |= MATCH_ANY;
   else if (pat && pat[0] == '#')
     {
       mflags |= MATCH_BEG;
@@ -5798 +5857 @@
 #if defined (ARRAY_VARS)
     case VT_ARRAYVAR:
       temp = array_patsub (array_cell (v), p, rep, mflags);
+#if 0
+      /* Don't need to do this anymore; array_patsub calls array_quote_escapes
+         as appropriate before adding the space separators. */
       if (temp && (mflags & MATCH_QUOTED) == 0)
         {
           tt = quote_escapes (temp);
           free (temp);
           temp = tt;
         }
+#endif
       break;
 #endif
     }
@@ -7607 +7670 @@
   expand_no_split_dollar_star = 0;      /* XXX */
   expanding_redir = 0;
 
+  top_level_cleanup ();                 /* from sig.c */
+
   jump_to_top_level (v);
 }
 
@@ -7824 +7889 @@
           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)
             {

subst.h

@@ -222 +222 @@
 extern char *command_substitute __P((char *, int));
 extern char *pat_subst __P((char *, char *, char *, int));
 
+extern int fifos_pending __P((void));
 extern void unlink_fifo_list __P((void));
 
 extern WORD_LIST *list_string_with_quotes __P((char *));

tests/new-exp.right

@@ -430 +430 @@
 Case06---1---A B C::---
 Case07---3---A:B:C---
 Case08---3---A:B:C---
-./new-exp.tests: line 506: /${$(($#-1))}: bad substitution
+./new-exp.tests: line 506: ${$(($#-1))}: bad substitution
 argv[1] = <a>
 argv[2] = <b>
 argv[3] = <c>

variables.c

@@ -1821 +1821 @@
           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);

version.c

@@ -79 +79 @@
 {
   printf ("GNU bash, version %s (%s)\n", shell_version_string (), MACHTYPE);
   if (extended)
-    printf (_("Copyright (C) 2005 Free Software Foundation, Inc.\n"));
+    printf (_("Copyright (C) 2007 Free Software Foundation, Inc.\n"));
 }