Changeset b35707a

Timestamp:

Dec 29, 2008, 8:04:33 PM (16 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

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

Children:

077f768

Parents:

022cd24

Message:

Updated Bash Patch to -9

Files:

• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/bash-3.2-fixes-9.patch (moved) (moved from patches/bash-3.2-fixes-8.patch ) (61 diffs)

BOOK/introduction/common/changelog.xml

@@ -53 +53 @@
         <listitem>
           <para>[Jim] - Updated Linux to 2.6.28.</para>
+        </listitem>
+        <listitem>
+          <para>[Jim] - Updated Bash Patch to -9.</para>
         </listitem>
       </itemizedlist>

BOOK/patches.ent

@@ -5 +5 @@
 <!-- Start of Common Patches -->
 
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-8.patch">
-<!ENTITY bash-fixes-patch-md5 "9f57c9bd5d7278529a9b13d8fc36a02e">
-<!ENTITY bash-fixes-patch-size "416 KB">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-9.patch">
+<!ENTITY bash-fixes-patch-md5 "f95ef1f0cce20d865f05a48f31b152ad">
+<!ENTITY bash-fixes-patch-size "424 KB">
 
 <!ENTITY binutils-branch_update-patch "binutils-&binutils-version;-branch_update-1.patch">

patches/bash-3.2-fixes-9.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 06-18-2008
+Date: 12-20-2008
 Initial Package Version: 3.2
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches up to 3.2-039
+Description: Contains all upstream patches up to 3.2-048
 
 diff -Naur bash-3.2.orig/array.c bash-3.2/array.c
---- bash-3.2.orig/array.c       2005-06-01 16:39:22.000000000 -0400
-+++ bash-3.2/array.c    2008-06-18 06:46:19.000000000 -0400
+--- bash-3.2.orig/array.c       2005-06-01 13:39:22.000000000 -0700
++++ bash-3.2/array.c    2008-12-20 07:00:08.000000000 -0800
 @@ -120,7 +120,6 @@
         return(a1);
@@ -105 +105 @@
                 ifs = getifs();
                 sifs[0] = ifs ? *ifs : '\0';
+@@ -655,7 +683,7 @@
+                is = inttostr (element_index(ae), indstr, sizeof(indstr));
+                valstr = element_value (ae) ? sh_double_quote (element_value(ae))
+                                            : (char *)NULL;
+-               elen = STRLEN (indstr) + 8 + STRLEN (valstr);
++               elen = STRLEN (is) + 8 + STRLEN (valstr);
+                RESIZE_MALLOCED_BUFFER (result, rlen, (elen + 1), rsize, rsize);
+ 
+                result[rlen++] = '[';
 diff -Naur bash-3.2.orig/array.h bash-3.2/array.h
---- bash-3.2.orig/array.h       2003-06-01 15:50:30.000000000 -0400
-+++ bash-3.2/array.h    2008-06-18 06:46:19.000000000 -0400
+--- bash-3.2.orig/array.h       2003-06-01 12:50:30.000000000 -0700
++++ bash-3.2/array.h    2008-12-20 06:59:28.000000000 -0800
 @@ -55,6 +55,7 @@
  extern ARRAY_ELEMENT *array_unshift_element __P((ARRAY *));
@@ -117 +126 @@
  extern char    *array_patsub __P((ARRAY *, char *, char *, int));
 diff -Naur bash-3.2.orig/arrayfunc.c bash-3.2/arrayfunc.c
---- bash-3.2.orig/arrayfunc.c   2006-07-27 09:37:59.000000000 -0400
-+++ bash-3.2/arrayfunc.c        2008-06-18 06:46:30.000000000 -0400
+--- bash-3.2.orig/arrayfunc.c   2006-07-27 06:37:59.000000000 -0700
++++ bash-3.2/arrayfunc.c        2008-12-20 06:59:57.000000000 -0800
 @@ -618,6 +618,8 @@
    if (expok == 0)
@@ -137 +146 @@
         {
           err_badarraysub (s);
+diff -Naur bash-3.2.orig/bashhist.c bash-3.2/bashhist.c
+--- bash-3.2.orig/bashhist.c    2005-12-26 10:31:16.000000000 -0800
++++ bash-3.2/bashhist.c 2008-12-20 07:00:10.000000000 -0800
+@@ -80,6 +80,7 @@
+    list.  This is different than the user-controlled behaviour; this
+    becomes zero when we read lines from a file, for example. */
+ int remember_on_history = 1;
++int enable_history_list = 1;   /* value for `set -o history' */
+ 
+ /* The number of lines that Bash has added to this history session.  The
+    difference between the number of the top element in the history list
+@@ -234,7 +235,7 @@
+   history_expansion = interact != 0;
+   history_expansion_inhibited = 1;
+ #endif
+-  remember_on_history = interact != 0;
++  remember_on_history = enable_history_list = interact != 0;
+   history_inhibit_expansion_function = bash_history_inhibit_expansion;
+ }
+ 
+diff -Naur bash-3.2.orig/bashhist.h bash-3.2/bashhist.h
+--- bash-3.2.orig/bashhist.h    2005-07-01 12:44:41.000000000 -0700
++++ bash-3.2/bashhist.h 2008-12-20 07:00:10.000000000 -0800
+@@ -31,6 +31,9 @@
+ #define HC_IGNBOTH     (HC_IGNSPACE|HC_IGNDUPS)
+ 
+ extern int remember_on_history;
++extern int enable_history_list;                /* value for `set -o history' */
++extern int literal_history;            /* controlled by `shopt lithist' */
++extern int force_append_history;
+ extern int history_lines_this_session;
+ extern int history_lines_in_file;
+ extern int history_expansion;
 diff -Naur bash-3.2.orig/bashline.c bash-3.2/bashline.c
---- bash-3.2.orig/bashline.c    2006-07-29 16:39:30.000000000 -0400
-+++ bash-3.2/bashline.c 2008-06-18 06:46:32.000000000 -0400
+--- bash-3.2.orig/bashline.c    2006-07-29 13:39:30.000000000 -0700
++++ bash-3.2/bashline.c 2008-12-20 07:00:04.000000000 -0800
 @@ -2357,7 +2357,7 @@
    if (should_expand_dirname)  
@@ -150 +192 @@
           *dirname = string_list (wl);
 diff -Naur bash-3.2.orig/builtins/common.c bash-3.2/builtins/common.c
---- bash-3.2.orig/builtins/common.c     2006-07-27 09:39:51.000000000 -0400
-+++ bash-3.2/builtins/common.c  2008-06-18 06:46:23.000000000 -0400
+--- bash-3.2.orig/builtins/common.c     2006-07-27 06:39:51.000000000 -0700
++++ bash-3.2/builtins/common.c  2008-12-20 06:59:37.000000000 -0800
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
@@ -190 +232 @@
         {
           fprintf (stderr, _("%s: error retrieving current directory: %s: %s\n"),
+diff -Naur bash-3.2.orig/builtins/evalstring.c bash-3.2/builtins/evalstring.c
+--- bash-3.2.orig/builtins/evalstring.c 2006-07-28 12:12:16.000000000 -0700
++++ bash-3.2/builtins/evalstring.c      2008-12-20 07:00:21.000000000 -0800
+@@ -67,6 +67,14 @@
+ 
+ static int cat_file __P((REDIRECT *));
+ 
++#if defined (HISTORY)
++static void
++set_history_remembering ()
++{
++  remember_on_history = enable_history_list;
++}
++#endif
++
+ /* How to force parse_and_execute () to clean up after itself. */
+ void
+ parse_and_execute_cleanup ()
+@@ -115,7 +123,10 @@
+   lreset = flags & SEVAL_RESETLINE;
+ 
+ #if defined (HISTORY)
+-  unwind_protect_int (remember_on_history);    /* can be used in scripts */
++  if (parse_and_execute_level == 0)
++    add_unwind_protect (set_history_remembering, (char *)NULL);
++  else
++    unwind_protect_int (remember_on_history);  /* can be used in scripts */
+ #  if defined (BANG_HISTORY)
+   if (interactive_shell)
+     {
+@@ -237,6 +248,7 @@
+               *   parse_and_execute has not been called recursively AND
+               *   we're not running a trap AND
+               *   we have parsed the full command (string == '\0') AND
++              *   we're not going to run the exit trap AND
+               *   we have a simple command without redirections AND
+               *   the command is not being timed AND
+               *   the command's return status is not being inverted
+@@ -247,7 +259,8 @@
+                  running_trap == 0 &&
+                  *bash_input.location.string == '\0' &&
+                  command->type == cm_simple &&
+-                 !command->redirects && !command->value.Simple->redirects &&
++                 signal_is_trapped (EXIT_TRAP) == 0 &&
++                 command->redirects == 0 && command->value.Simple->redirects == 0 &&
+                  ((command->flags & CMD_TIME_PIPELINE) == 0) &&
+                  ((command->flags & CMD_INVERT_RETURN) == 0))
+                {
 diff -Naur bash-3.2.orig/builtins/printf.def bash-3.2/builtins/printf.def
---- bash-3.2.orig/builtins/printf.def   2006-09-18 08:48:42.000000000 -0400
-+++ bash-3.2/builtins/printf.def        2008-06-18 06:46:18.000000000 -0400
+--- bash-3.2.orig/builtins/printf.def   2006-09-18 05:48:42.000000000 -0700
++++ bash-3.2/builtins/printf.def        2008-12-20 06:59:25.000000000 -0800
 @@ -1,7 +1,7 @@
  This file is printf.def, from which is created printf.c.
@@ -238 +328 @@
  static int tescape __P((char *, char *, int *));
 diff -Naur bash-3.2.orig/builtins/read.def bash-3.2/builtins/read.def
---- bash-3.2.orig/builtins/read.def     2006-09-19 08:45:48.000000000 -0400
-+++ bash-3.2/builtins/read.def  2008-06-18 06:46:33.000000000 -0400
+--- bash-3.2.orig/builtins/read.def     2006-09-19 05:45:48.000000000 -0700
++++ bash-3.2/builtins/read.def  2008-12-20 07:00:05.000000000 -0800
 @@ -127,14 +127,14 @@
       WORD_LIST *list;
@@ -337 +427 @@
      VUNSETATTR (var, att_invisible);
    xfree (orig_input_string);
+diff -Naur bash-3.2.orig/builtins/set.def bash-3.2/builtins/set.def
+--- bash-3.2.orig/builtins/set.def      2006-07-27 06:41:43.000000000 -0700
++++ bash-3.2/builtins/set.def   2008-12-20 07:00:10.000000000 -0800
+@@ -189,7 +189,7 @@
+   { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+ #endif /* BANG_HISTORY */
+ #if defined (HISTORY)
+-  { "history",   '\0', &remember_on_history, bash_set_history, (setopt_get_func_t *)NULL },
++  { "history",   '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL },
+ #endif
+   { "ignoreeof", '\0', &ignoreeof, set_ignoreeof, (setopt_get_func_t *)NULL },
+   { "interactive-comments", '\0', &interactive_comments, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+@@ -381,13 +381,17 @@
+ {
+   if (on_or_off == FLAG_ON)
+     {
++      enable_history_list = 1;
+       bash_history_enable ();
+       if (history_lines_this_session == 0)
+        load_history ();
+     }
+   else
+-    bash_history_disable ();
+-  return (1 - remember_on_history);
++    {
++      enable_history_list = 0;
++      bash_history_disable ();
++    }
++  return (1 - enable_history_list);
+ }
+ #endif
+ 
+@@ -565,7 +569,7 @@
+ reset_shell_options ()
+ {
+ #if defined (HISTORY)
+-  remember_on_history = 1;
++  remember_on_history = enable_history_list = 1;
+ #endif
+   ignoreeof = 0;
+ }
 diff -Naur bash-3.2.orig/builtins/shopt.def bash-3.2/builtins/shopt.def
---- bash-3.2.orig/builtins/shopt.def    2005-02-19 17:25:03.000000000 -0500
-+++ bash-3.2/builtins/shopt.def 2008-06-18 06:46:33.000000000 -0400
+--- bash-3.2.orig/builtins/shopt.def    2005-02-19 14:25:03.000000000 -0800
++++ bash-3.2/builtins/shopt.def 2008-12-20 07:00:07.000000000 -0800
 @@ -101,11 +101,14 @@
  
@@ -383 +514 @@
  
 diff -Naur bash-3.2.orig/config-bot.h bash-3.2/config-bot.h
---- bash-3.2.orig/config-bot.h  2006-09-12 16:43:04.000000000 -0400
-+++ bash-3.2/config-bot.h       2008-06-18 06:46:18.000000000 -0400
+--- bash-3.2.orig/config-bot.h  2006-09-12 13:43:04.000000000 -0700
++++ bash-3.2/config-bot.h       2008-12-20 06:59:23.000000000 -0800
 @@ -1,7 +1,7 @@
  /* config-bot.h */
@@ -410 +541 @@
  
 diff -Naur bash-3.2.orig/config.h.in bash-3.2/config.h.in
---- bash-3.2.orig/config.h.in   2006-09-12 16:00:54.000000000 -0400
-+++ bash-3.2/config.h.in        2008-06-18 06:46:18.000000000 -0400
+--- bash-3.2.orig/config.h.in   2006-09-12 13:00:54.000000000 -0700
++++ bash-3.2/config.h.in        2008-12-20 06:59:25.000000000 -0800
 @@ -1,6 +1,6 @@
  /* config.h -- Configuration file for bash. */
@@ -440 +571 @@
  
 diff -Naur bash-3.2.orig/configure bash-3.2/configure
---- bash-3.2.orig/configure     2006-09-26 11:06:01.000000000 -0400
-+++ bash-3.2/configure  2008-06-18 06:46:26.000000000 -0400
+--- bash-3.2.orig/configure     2006-09-26 08:06:01.000000000 -0700
++++ bash-3.2/configure  2008-12-20 06:59:47.000000000 -0800
 @@ -4871,7 +4871,7 @@
                 # static version specified as -llibname to override the
@@ -462 +593 @@
                 case "`uname -r`" in
 diff -Naur bash-3.2.orig/configure.in bash-3.2/configure.in
---- bash-3.2.orig/configure.in  2006-09-26 11:05:45.000000000 -0400
-+++ bash-3.2/configure.in       2008-06-18 06:46:26.000000000 -0400
+--- bash-3.2.orig/configure.in  2006-09-26 08:05:45.000000000 -0700
++++ bash-3.2/configure.in       2008-12-20 06:59:46.000000000 -0800
 @@ -5,7 +5,7 @@
  dnl
@@ -493 +624 @@
                 case "`uname -r`" in
 diff -Naur bash-3.2.orig/doc/bash.1 bash-3.2/doc/bash.1
---- bash-3.2.orig/doc/bash.1    2006-10-03 08:54:26.000000000 -0400
-+++ bash-3.2/doc/bash.1 2008-06-18 06:46:33.000000000 -0400
+--- bash-3.2.orig/doc/bash.1    2006-10-03 05:54:26.000000000 -0700
++++ bash-3.2/doc/bash.1 2008-12-20 07:00:07.000000000 -0800
 @@ -7977,6 +7977,12 @@
  command in the same history entry.  This allows
@@ -509 +640 @@
  .B bash
 diff -Naur bash-3.2.orig/doc/bashref.texi bash-3.2/doc/bashref.texi
---- bash-3.2.orig/doc/bashref.texi      2006-09-28 10:25:28.000000000 -0400
-+++ bash-3.2/doc/bashref.texi   2008-06-18 06:46:33.000000000 -0400
+--- bash-3.2.orig/doc/bashref.texi      2006-09-28 07:25:28.000000000 -0700
++++ bash-3.2/doc/bashref.texi   2008-12-20 07:00:07.000000000 -0800
 @@ -3598,6 +3598,11 @@
  command in the same history entry.  This allows
@@ -524 +655 @@
  the results of filename expansion.
 diff -Naur bash-3.2.orig/doc/bashref.texi.orig bash-3.2/doc/bashref.texi.orig
---- bash-3.2.orig/doc/bashref.texi.orig 1969-12-31 19:00:00.000000000 -0500
-+++ bash-3.2/doc/bashref.texi.orig      2006-09-28 10:25:28.000000000 -0400
+--- bash-3.2.orig/doc/bashref.texi.orig 1969-12-31 16:00:00.000000000 -0800
++++ bash-3.2/doc/bashref.texi.orig      2006-09-28 07:25:28.000000000 -0700
 @@ -0,0 +1,7422 @@
 +\input texinfo.tex @c -*- texinfo -*-
@@ -7950 +8081 @@
 +@bye
 diff -Naur bash-3.2.orig/execute_cmd.c bash-3.2/execute_cmd.c
---- bash-3.2.orig/execute_cmd.c 2006-08-26 00:23:17.000000000 -0400
-+++ bash-3.2/execute_cmd.c      2008-06-18 06:46:33.000000000 -0400
+--- bash-3.2.orig/execute_cmd.c 2006-08-25 21:23:17.000000000 -0700
++++ bash-3.2/execute_cmd.c      2008-12-20 07:00:16.000000000 -0800
 @@ -1,6 +1,6 @@
  /* execute_cmd.c -- Execute a COMMAND structure. */
@@ -7960 +8091 @@
     This file is part of GNU Bash, the Bourne Again SHell.
  
-@@ -614,7 +614,7 @@
+@@ -501,8 +501,15 @@
+   volatile int last_pid;
+   volatile int save_line_number;
+ 
++#if 0
+   if (command == 0 || breaking || continuing || read_but_dont_execute)
+     return (EXECUTION_SUCCESS);
++#else
++  if (breaking || continuing)
++    return (last_command_exit_value);
++  if (command == 0 || read_but_dont_execute)
++    return (EXECUTION_SUCCESS);
++#endif
+ 
+   QUIT;
+   run_pending_traps ();
+@@ -614,7 +621,7 @@
        cleanup_redirects (redirection_undo_list);
        redirection_undo_list = (REDIRECT *)NULL;
@@ -7969 +8116 @@
  
    if (redirection_undo_list)
-@@ -2546,7 +2546,8 @@
+@@ -2546,7 +2553,8 @@
        arg1 = cond_expand_word (cond->left->op, 0);
        if (arg1 == 0)
@@ -7979 +8126 @@
         arg2 = nullstr;
  
-@@ -3050,6 +3051,11 @@
+@@ -3050,6 +3058,11 @@
    if (command_line == 0)
      command_line = savestring (the_printed_command_except_trap);
@@ -7991 +8138 @@
                         pipe_in, pipe_out, async, fds_to_close,
                         simple_command->flags);
-@@ -3875,6 +3881,8 @@
+@@ -3875,6 +3888,8 @@
      shell_variables = shell_variables->down;
  
@@ -8001 +8148 @@
    variable_context = return_catch_flag = 0;
 diff -Naur bash-3.2.orig/expr.c bash-3.2/expr.c
---- bash-3.2.orig/expr.c        2005-12-28 17:47:03.000000000 -0500
-+++ bash-3.2/expr.c     2008-06-18 06:46:28.000000000 -0400
+--- bash-3.2.orig/expr.c        2005-12-28 14:47:03.000000000 -0800
++++ bash-3.2/expr.c     2008-12-20 07:00:12.000000000 -0800
 @@ -286,6 +286,8 @@
        free (expr_stack[expr_depth]);
@@ -8020 +8167 @@
    FASTCOPY (evalbuf, oevalbuf, sizeof (evalbuf));
  
-@@ -929,6 +932,7 @@
+@@ -517,7 +520,8 @@
+          set_noeval = 1;
+          noeval++;
+        }
+-      val2 = explor ();
++
++      val2 = expcond ();
+       if (set_noeval)
+        noeval--;
+       rval = cval ? val1 : val2;
+@@ -929,6 +933,7 @@
        if (interactive_shell)
         {
@@ -8029 +8186 @@
        else
 diff -Naur bash-3.2.orig/findcmd.c bash-3.2/findcmd.c
---- bash-3.2.orig/findcmd.c     2005-08-17 16:49:54.000000000 -0400
-+++ bash-3.2/findcmd.c  2008-06-18 06:46:16.000000000 -0400
+--- bash-3.2.orig/findcmd.c     2005-08-17 13:49:54.000000000 -0700
++++ bash-3.2/findcmd.c  2008-12-20 06:59:18.000000000 -0800
 @@ -308,7 +308,7 @@
    if (hashed_file && (posixly_correct || check_hashed_filenames))
@@ -8041 +8198 @@
           free (hashed_file);
 diff -Naur bash-3.2.orig/jobs.c bash-3.2/jobs.c
---- bash-3.2.orig/jobs.c        2006-07-29 16:40:48.000000000 -0400
-+++ bash-3.2/jobs.c     2008-06-18 06:46:31.000000000 -0400
+--- bash-3.2.orig/jobs.c        2006-07-29 13:40:48.000000000 -0700
++++ bash-3.2/jobs.c     2008-12-20 07:00:00.000000000 -0800
 @@ -250,6 +250,7 @@
  static int job_exit_signal __P((int));
@@ -8200 +8357 @@
           signal handler path */
 diff -Naur bash-3.2.orig/lib/readline/complete.c bash-3.2/lib/readline/complete.c
---- bash-3.2.orig/lib/readline/complete.c       2006-07-28 11:35:49.000000000 -0400
-+++ bash-3.2/lib/readline/complete.c    2008-06-18 06:46:22.000000000 -0400
+--- bash-3.2.orig/lib/readline/complete.c       2006-07-28 08:35:49.000000000 -0700
++++ bash-3.2/lib/readline/complete.c    2008-12-20 06:59:36.000000000 -0800
 @@ -428,7 +428,7 @@
         return (1);
@@ -8212 +8369 @@
         return (2);
 diff -Naur bash-3.2.orig/lib/readline/display.c bash-3.2/lib/readline/display.c
---- bash-3.2.orig/lib/readline/display.c        2006-09-14 14:20:12.000000000 -0400
-+++ bash-3.2/lib/readline/display.c     2008-06-18 06:46:29.000000000 -0400
+--- bash-3.2.orig/lib/readline/display.c        2006-09-14 11:20:12.000000000 -0700
++++ bash-3.2/lib/readline/display.c     2008-12-20 07:00:15.000000000 -0800
 @@ -391,14 +391,14 @@
        t = ++p;
@@ -8257 +8414 @@
  #if defined (HANDLE_MULTIBYTE)   
  #define CHECK_LPOS() \
-@@ -1036,7 +1048,7 @@
+@@ -898,6 +910,10 @@
+             second and subsequent lines start at inv_lbreaks[N], offset by
+             OFFSET (which has already been calculated above).  */
+ 
++#define INVIS_FIRST()  (prompt_physical_chars > _rl_screenwidth ? prompt_invis_chars_first_line : wrap_offset)
++#define WRAP_OFFSET(line, offset)  ((line == 0) \
++                                       ? (offset ? INVIS_FIRST() : 0) \
++                                       : ((line == prompt_last_screen_line) ? wrap_offset-prompt_invis_chars_first_line : 0))
+ #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])
+@@ -932,7 +948,13 @@
+                  _rl_last_c_pos != o_cpos &&
+                  _rl_last_c_pos > wrap_offset &&
+                  o_cpos < prompt_last_invisible)
+-               _rl_last_c_pos -= wrap_offset;
++               _rl_last_c_pos -= prompt_invis_chars_first_line;        /* XXX - was wrap_offset */
++             else if (linenum == prompt_last_screen_line && prompt_physical_chars > _rl_screenwidth &&
++                       (MB_CUR_MAX > 1 && rl_byte_oriented == 0) &&
++                       cpos_adjusted == 0 &&
++                       _rl_last_c_pos != o_cpos &&
++                       _rl_last_c_pos > (prompt_last_invisible - _rl_screenwidth - prompt_invis_chars_first_line))
++               _rl_last_c_pos -= (wrap_offset-prompt_invis_chars_first_line);
+                  
+              /* If this is the line with the prompt, we might need to
+                 compensate for invisible characters in the new line. Do
+@@ -1036,7 +1058,7 @@
                 tx = _rl_col_width (&visible_line[pos], 0, nleft) - visible_wrap_offset;
               else
@@ -8266 +8449 @@
                   _rl_backspace (_rl_last_c_pos - tx);  /* XXX */
                   _rl_last_c_pos = tx;
-@@ -1192,7 +1204,7 @@
+@@ -1192,7 +1214,7 @@
       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 temp, lendiff, wsatend, od, nd, twidth, o_cpos;
    int current_invis_chars;
    int col_lendiff, col_temp;
  #if defined (HANDLE_MULTIBYTE)
-@@ -1453,6 +1465,8 @@
+@@ -1208,7 +1230,7 @@
+   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);
++    temp = _rl_last_c_pos - WRAP_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)
+     {
+@@ -1453,6 +1475,8 @@
         _rl_last_c_pos = lendiff;
      }
@@ -8284 +8476 @@
       cursor postion in multibyte mode, but a buffer index when not in a
       multibyte locale. */
-@@ -1462,7 +1476,9 @@
+@@ -1462,7 +1486,9 @@
    /* 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
@@ -8295 +8487 @@
  #endif
  #endif
-@@ -1506,11 +1522,31 @@
+@@ -1506,11 +1532,31 @@
      {
        /* Non-zero if we're increasing the number of lines. */
@@ -8328 +8520 @@
           /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
              _rl_horizontal_scroll_mode == 1, inserting the characters with
-@@ -1533,11 +1569,16 @@
+@@ -1533,11 +1579,16 @@
             }
           else
@@ -8348 +8540 @@
             }
           /* Copy (new) chars to screen from first diff to last match. */
-@@ -1586,8 +1627,22 @@
+@@ -1545,15 +1596,15 @@
+          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
++             if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
++               twidth = _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
++             else
++               twidth = temp - lendiff;
++             _rl_last_c_pos += twidth;
+            }
+        }
+       else
+@@ -1586,8 +1637,22 @@
           temp = nls - nfd;
           if (temp > 0)
@@ -8372 +8585 @@
         }
        /* Otherwise, print over the existing material. */
-@@ -1595,8 +1650,20 @@
+@@ -1595,8 +1660,20 @@
         {
           if (temp > 0)
@@ -8393 +8606 @@
           lendiff = (oe - old) - (ne - new);
           if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-@@ -1732,7 +1799,10 @@
+@@ -1721,7 +1798,7 @@
+   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);
++  woff = WRAP_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
+@@ -1732,7 +1809,14 @@
    if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
      {
@@ -8401 +8623 @@
 +        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 */
++      if ((new > prompt_last_invisible) ||             /* XXX - don't use woff here */
++         (prompt_physical_chars > _rl_screenwidth &&
++          _rl_last_v_pos == prompt_last_screen_line &&
++          wrap_offset != woff &&
++          new > (prompt_last_invisible-_rl_screenwidth-wrap_offset)))
         {
           dpos -= woff;
           /* Since this will be assigned to _rl_last_c_pos at the end (more
-@@ -2380,6 +2450,8 @@
+@@ -2380,6 +2464,8 @@
  
    if (end <= start)
@@ -8415 +8641 @@
  
 diff -Naur bash-3.2.orig/lib/readline/display.c.orig bash-3.2/lib/readline/display.c.orig
---- bash-3.2.orig/lib/readline/display.c.orig   1969-12-31 19:00:00.000000000 -0500
-+++ bash-3.2/lib/readline/display.c.orig        2008-06-18 06:46:27.000000000 -0400
+--- bash-3.2.orig/lib/readline/display.c.orig   1969-12-31 16:00:00.000000000 -0800
++++ bash-3.2/lib/readline/display.c.orig        2008-12-20 06:59:50.000000000 -0800
 @@ -0,0 +1,2518 @@
 +/* display.c -- readline redisplay facility. */
@@ -10937 +11163 @@
 +#endif /* HANDLE_MULTIBYTE */
 diff -Naur bash-3.2.orig/lib/readline/input.c bash-3.2/lib/readline/input.c
---- bash-3.2.orig/lib/readline/input.c  2006-08-16 15:15:16.000000000 -0400
-+++ bash-3.2/lib/readline/input.c       2008-06-18 06:46:29.000000000 -0400
+--- bash-3.2.orig/lib/readline/input.c  2006-08-16 12:15:16.000000000 -0700
++++ bash-3.2/lib/readline/input.c       2008-12-20 06:59:56.000000000 -0800
 @@ -133,8 +133,11 @@
      return (0);
@@ -11023 +11249 @@
        memset (&ps, 0, sizeof (mbstate_t));
 diff -Naur bash-3.2.orig/lib/readline/isearch.c bash-3.2/lib/readline/isearch.c
---- bash-3.2.orig/lib/readline/isearch.c        2005-12-26 17:18:53.000000000 -0500
-+++ bash-3.2/lib/readline/isearch.c     2008-06-18 06:46:22.000000000 -0400
+--- bash-3.2.orig/lib/readline/isearch.c        2005-12-26 14:18:53.000000000 -0800
++++ bash-3.2/lib/readline/isearch.c     2008-12-20 06:59:36.000000000 -0800
 @@ -327,8 +327,15 @@
    rl_command_func_t *f;
@@ -11044 +11270 @@
        f = _rl_keymap[c].function;
 diff -Naur bash-3.2.orig/lib/readline/misc.c bash-3.2/lib/readline/misc.c
---- bash-3.2.orig/lib/readline/misc.c   2005-12-26 17:20:46.000000000 -0500
-+++ bash-3.2/lib/readline/misc.c        2008-06-18 06:46:22.000000000 -0400
+--- bash-3.2.orig/lib/readline/misc.c   2005-12-26 14:20:46.000000000 -0800
++++ bash-3.2/lib/readline/misc.c        2008-12-20 06:59:36.000000000 -0800
 @@ -146,6 +146,8 @@
           rl_restore_prompt ();
@@ -11056 +11282 @@
      }
 diff -Naur bash-3.2.orig/lib/readline/readline.c bash-3.2/lib/readline/readline.c
---- bash-3.2.orig/lib/readline/readline.c       2006-08-16 15:00:36.000000000 -0400
-+++ bash-3.2/lib/readline/readline.c    2008-06-18 06:46:22.000000000 -0400
+--- bash-3.2.orig/lib/readline/readline.c       2006-08-16 12:00:36.000000000 -0700
++++ bash-3.2/lib/readline/readline.c    2008-12-20 06:59:36.000000000 -0800
 @@ -645,6 +645,11 @@
    if ((cxt->flags & KSEQ_DISPATCHED) == 0)
@@ -11071 +11297 @@
      }
 diff -Naur bash-3.2.orig/lib/readline/text.c bash-3.2/lib/readline/text.c
---- bash-3.2.orig/lib/readline/text.c   2006-07-28 11:55:27.000000000 -0400
-+++ bash-3.2/lib/readline/text.c        2008-06-18 06:46:22.000000000 -0400
+--- bash-3.2.orig/lib/readline/text.c   2006-07-28 08:55:27.000000000 -0700
++++ bash-3.2/lib/readline/text.c        2008-12-20 06:59:36.000000000 -0800
 @@ -857,6 +857,9 @@
    c = rl_read_key ();
@@ -11104 +11330 @@
    else
 diff -Naur bash-3.2.orig/lib/readline/vi_mode.c bash-3.2/lib/readline/vi_mode.c
---- bash-3.2.orig/lib/readline/vi_mode.c        2006-07-29 16:42:28.000000000 -0400
-+++ bash-3.2/lib/readline/vi_mode.c     2008-06-18 06:46:22.000000000 -0400
+--- bash-3.2.orig/lib/readline/vi_mode.c        2006-07-29 13:42:28.000000000 -0700
++++ bash-3.2/lib/readline/vi_mode.c     2008-12-20 06:59:36.000000000 -0800
 @@ -886,6 +886,13 @@
    RL_SETSTATE(RL_STATE_MOREINPUT);
@@ -11234 +11460 @@
        return -1;
 diff -Naur bash-3.2.orig/lib/sh/getcwd.c bash-3.2/lib/sh/getcwd.c
---- bash-3.2.orig/lib/sh/getcwd.c       2004-07-21 17:15:19.000000000 -0400
-+++ bash-3.2/lib/sh/getcwd.c    2008-06-18 06:46:31.000000000 -0400
+--- bash-3.2.orig/lib/sh/getcwd.c       2004-07-21 14:15:19.000000000 -0700
++++ bash-3.2/lib/sh/getcwd.c    2008-12-20 06:59:59.000000000 -0800
 @@ -251,19 +251,21 @@
  
@@ -11267 +11493 @@
  
 diff -Naur bash-3.2.orig/lib/sh/snprintf.c bash-3.2/lib/sh/snprintf.c
---- bash-3.2.orig/lib/sh/snprintf.c     2006-04-06 09:48:40.000000000 -0400
-+++ bash-3.2/lib/sh/snprintf.c  2008-06-18 06:46:17.000000000 -0400
+--- bash-3.2.orig/lib/sh/snprintf.c     2006-04-06 06:48:40.000000000 -0700
++++ bash-3.2/lib/sh/snprintf.c  2008-12-20 06:59:20.000000000 -0800
 @@ -471,6 +471,8 @@
           10^x ~= r
@@ -11396 +11622 @@
                  * is in the range or [-4,p] exclusively
 diff -Naur bash-3.2.orig/parse.y bash-3.2/parse.y
---- bash-3.2.orig/parse.y       2006-09-19 16:37:21.000000000 -0400
-+++ bash-3.2/parse.y    2008-06-18 06:46:32.000000000 -0400
+--- bash-3.2.orig/parse.y       2006-09-19 13:37:21.000000000 -0700
++++ bash-3.2/parse.y    2008-12-20 07:00:04.000000000 -0800
 @@ -1029,6 +1029,7 @@
  #define PST_CMDTOKEN   0x1000          /* command token OK - unused */
@@ -11528 +11754 @@
        dispose_words (list);
 diff -Naur bash-3.2.orig/patchlevel.h bash-3.2/patchlevel.h
---- bash-3.2.orig/patchlevel.h  2006-04-13 08:31:04.000000000 -0400
-+++ bash-3.2/patchlevel.h       2008-06-18 06:46:33.000000000 -0400
+--- bash-3.2.orig/patchlevel.h  2006-04-13 05:31:04.000000000 -0700
++++ bash-3.2/patchlevel.h       2008-12-20 07:00:21.000000000 -0800
 @@ -25,6 +25,6 @@
     regexp `^#define[   ]*PATCHLEVEL', since that's what support/mkversion.sh
@@ -11535 +11761 @@
  
 -#define PATCHLEVEL 0
-+#define PATCHLEVEL 39
++#define PATCHLEVEL 48
  
  #endif /* _PATCHLEVEL_H_ */
 diff -Naur bash-3.2.orig/pathexp.c bash-3.2/pathexp.c
---- bash-3.2.orig/pathexp.c     2002-05-06 13:43:05.000000000 -0400
-+++ bash-3.2/pathexp.c  2008-06-18 06:46:17.000000000 -0400
+--- bash-3.2.orig/pathexp.c     2002-05-06 10:43:05.000000000 -0700
++++ bash-3.2/pathexp.c  2008-12-20 06:59:21.000000000 -0800
 @@ -1,6 +1,6 @@
  /* pathexp.c -- The shell interface to the globbing library. */
@@ -11593 +11819 @@
           if (pathname[i] == '\0')
 diff -Naur bash-3.2.orig/pathexp.h bash-3.2/pathexp.h
---- bash-3.2.orig/pathexp.h     2005-02-19 17:23:18.000000000 -0500
-+++ bash-3.2/pathexp.h  2008-06-18 06:46:17.000000000 -0400
+--- bash-3.2.orig/pathexp.h     2005-02-19 14:23:18.000000000 -0800
++++ bash-3.2/pathexp.h  2008-12-20 06:59:21.000000000 -0800
 @@ -1,6 +1,6 @@
  /* pathexp.h -- The shell interface to the globbing library. */
@@ -11612 +11838 @@
  /* Flags to OR with other flag args to strmatch() to enabled the extended
 diff -Naur bash-3.2.orig/po/ru.po bash-3.2/po/ru.po
---- bash-3.2.orig/po/ru.po      2006-01-10 17:51:03.000000000 -0500
-+++ bash-3.2/po/ru.po   2008-06-18 06:46:13.000000000 -0400
+--- bash-3.2.orig/po/ru.po      2006-01-10 14:51:03.000000000 -0800
++++ bash-3.2/po/ru.po   2008-12-20 06:59:08.000000000 -0800
 @@ -12,7 +12,7 @@
  "Last-Translator: Evgeniy Dushistov <dushistov@mail.ru>\n"
@@ -11624 +11850 @@
  
 diff -Naur bash-3.2.orig/shell.h bash-3.2/shell.h
---- bash-3.2.orig/shell.h       2003-06-01 15:04:36.000000000 -0400
-+++ bash-3.2/shell.h    2008-06-18 06:46:33.000000000 -0400
+--- bash-3.2.orig/shell.h       2003-06-01 12:04:36.000000000 -0700
++++ bash-3.2/shell.h    2008-12-20 07:00:07.000000000 -0800
 @@ -89,6 +89,7 @@
  extern int executing, login_shell;
@@ -11635 +11861 @@
     to close, and the size of that structure.  Used in execute_cmd.c. */
 diff -Naur bash-3.2.orig/sig.c bash-3.2/sig.c
---- bash-3.2.orig/sig.c 2006-01-25 14:57:59.000000000 -0500
-+++ bash-3.2/sig.c      2008-06-18 06:46:23.000000000 -0400
+--- bash-3.2.orig/sig.c 2006-01-25 11:57:59.000000000 -0800
++++ bash-3.2/sig.c      2008-12-20 06:59:37.000000000 -0800
 @@ -350,6 +350,25 @@
  #undef XSIG
@@ -11664 +11890 @@
  throw_to_top_level ()
 diff -Naur bash-3.2.orig/sig.h bash-3.2/sig.h
---- bash-3.2.orig/sig.h 2006-01-25 14:50:27.000000000 -0500
-+++ bash-3.2/sig.h      2008-06-18 06:46:23.000000000 -0400
+--- bash-3.2.orig/sig.h 2006-01-25 11:50:27.000000000 -0800
++++ bash-3.2/sig.h      2008-12-20 06:59:37.000000000 -0800
 @@ -121,6 +121,7 @@
  extern void initialize_signals __P((int));
@@ -11675 +11901 @@
  
 diff -Naur bash-3.2.orig/subst.c bash-3.2/subst.c
---- bash-3.2.orig/subst.c       2006-09-19 08:35:09.000000000 -0400
-+++ bash-3.2/subst.c    2008-06-18 06:46:32.000000000 -0400
+--- bash-3.2.orig/subst.c       2006-09-19 05:35:09.000000000 -0700
++++ bash-3.2/subst.c    2008-12-20 07:00:19.000000000 -0800
 @@ -4,7 +4,7 @@
  /* ``Have a little faith, there's magic in the night.  You ain't a
@@ -11686 +11912 @@
     This file is part of GNU Bash, the Bourne Again SHell.
  
+@@ -137,7 +137,7 @@
+ /* Extern functions and variables from different files. */
+ extern int last_command_exit_value, last_command_exit_signal;
+ extern int subshell_environment;
+-extern int subshell_level;
++extern int subshell_level, parse_and_execute_level;
+ extern int eof_encountered;
+ extern int return_catch_flag, return_catch_value;
+ extern pid_t dollar_dollar_pid;
 @@ -1278,7 +1278,7 @@
      {
@@ -11899 +12134 @@
      }
    else
+@@ -4763,7 +4812,7 @@
+   else
+     t = (ind == 0) ? value_cell (var) : (char *)NULL;
+ 
+-  len = STRLEN (t);
++  len = MB_STRLEN (t);
+   return (len);
+ }
+ #endif /* ARRAY_VARS */
 @@ -4860,10 +4909,11 @@
    char *temp, *tt;
@@ -11994 +12238 @@
  #endif
      }
-@@ -7607,6 +7672,8 @@
+@@ -7607,6 +7672,10 @@
    expand_no_split_dollar_star = 0;     /* XXX */
    expanding_redir = 0;
  
-+  top_level_cleanup ();                        /* from sig.c */
++  if (parse_and_execute_level == 0)
++    top_level_cleanup ();                      /* from sig.c */
++
 +
    jump_to_top_level (v);
  }
  
-@@ -7824,7 +7891,7 @@
+@@ -7824,7 +7893,7 @@
           else if (fail_glob_expansion != 0)
             {
@@ -12013 +12259 @@
             {
 diff -Naur bash-3.2.orig/subst.h bash-3.2/subst.h
---- bash-3.2.orig/subst.h       2006-09-19 08:34:41.000000000 -0400
-+++ bash-3.2/subst.h    2008-06-18 06:46:32.000000000 -0400
+--- bash-3.2.orig/subst.h       2006-09-19 05:34:41.000000000 -0700
++++ bash-3.2/subst.h    2008-12-20 07:00:04.000000000 -0800
 @@ -135,7 +135,7 @@
  extern WORD_LIST *expand_string_assignment __P((char *, int));
@@ -12033 +12279 @@
  extern WORD_LIST *list_string_with_quotes __P((char *));
 diff -Naur bash-3.2.orig/tests/new-exp.right bash-3.2/tests/new-exp.right
---- bash-3.2.orig/tests/new-exp.right   2006-08-10 12:00:00.000000000 -0400
-+++ bash-3.2/tests/new-exp.right        2008-06-18 06:46:14.000000000 -0400
+--- bash-3.2.orig/tests/new-exp.right   2006-08-10 09:00:00.000000000 -0700
++++ bash-3.2/tests/new-exp.right        2008-12-20 06:59:12.000000000 -0800
 @@ -430,7 +430,7 @@
  Case06---1---A B C::---
@@ -12045 +12291 @@
  argv[3] = <c>
 diff -Naur bash-3.2.orig/tests/shopt.right bash-3.2/tests/shopt.right
---- bash-3.2.orig/tests/shopt.right     2005-02-19 17:46:09.000000000 -0500
-+++ bash-3.2/tests/shopt.right  2008-06-18 06:46:33.000000000 -0400
+--- bash-3.2.orig/tests/shopt.right     2005-02-19 14:46:09.000000000 -0800
++++ bash-3.2/tests/shopt.right  2008-12-20 07:00:07.000000000 -0800
 @@ -6,6 +6,7 @@
  shopt -u checkhash
@@ -12072 +12318 @@
  extdebug               off
 diff -Naur bash-3.2.orig/variables.c bash-3.2/variables.c
---- bash-3.2.orig/variables.c   2006-09-08 13:33:32.000000000 -0400
-+++ bash-3.2/variables.c        2008-06-18 06:46:23.000000000 -0400
+--- bash-3.2.orig/variables.c   2006-09-08 10:33:32.000000000 -0700
++++ bash-3.2/variables.c        2008-12-20 07:00:13.000000000 -0800
 @@ -1821,11 +1821,17 @@
           oval = value_cell (var);
@@ -12094 +12340 @@
         rval += lval;
        retval = itos (rval);
+@@ -3452,9 +3458,11 @@
+       if (shell_variables == global_variables)
+        var->attributes &= ~(att_tempvar|att_propagate);
+       else
+-        shell_variables->flags |= VC_HASTMPVAR;
++       shell_variables->flags |= VC_HASTMPVAR;
+       v->attributes |= var->attributes;
+     }
++  else
++    stupidly_hack_special_variables (var->name);       /* XXX */
+ 
+   dispose_variable (var);
+ }
+@@ -3541,6 +3549,8 @@
+        var->attributes &= ~att_propagate;
+       v->attributes |= var->attributes;
+     }
++  else
++    stupidly_hack_special_variables (var->name);       /* XXX */
+ 
+   dispose_variable (var);
+ }
 diff -Naur bash-3.2.orig/version.c bash-3.2/version.c
---- bash-3.2.orig/version.c     2005-05-16 11:58:34.000000000 -0400
-+++ bash-3.2/version.c  2008-06-18 06:46:33.000000000 -0400
+--- bash-3.2.orig/version.c     2005-05-16 08:58:34.000000000 -0700
++++ bash-3.2/version.c  2008-12-20 07:00:07.000000000 -0800
 @@ -43,6 +43,9 @@
  #endif