commit bash-20040707 snapshot

diff --git a/CHANGES b/CHANGES
index 32d62fdf4773977abef575fe2e27fa0d5c0075f9..d4787673b8743953bd7bee70ba94794fe49935f3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,25 @@
+This document details the changes between this version, bash-3.0-release,
+and the previous version, bash-3.0-rc1.
+
+1.  Changes to Bash
+
+a.  Fixed a boundary overrun that could cause segmentation faults when the
+    completion code hands an incomplete construct to the word expansion
+    functions.
+
+b.  Changed posix mode behavior so that an error in a variable assignment
+    preceding a special builtin causes a non-interactive shell to exit.
+
+c.  Change the directory expansion portion of the completion code to not
+    expand embedded command substitutions if the directory name appears in
+    the file system.
+
+2.  Changes to Readline
+
+a.  Fixed a problem with readline saving the contents of the current line
+    before beginning a non-interactive search.
+
+------------------------------------------------------------------------------
 This document details the changes between this version, bash-3.0-rc1,
 and the previous version, bash-3.0-beta1.
 

diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog
index b408bc4de0a030aaab6638f4aedf61986b80ab47..83f5780bd6919f219d999463906f4690805f9391 100644 (file)
--- a/CWRU/CWRU.chlog
+++ b/CWRU/CWRU.chlog
@@ -9604,3 +9604,11 @@ bashline.c
          if the filename appears to have been completed from the file
          system rather than typed in by the user.  Bug reported by Tim
          Waugh <twaugh@redhat.com>
+
+                                   7/7
+                                   ---
+lib/readline/misc.c
+       - if _rl_maybe_save_line is being asked to save a line other than
+         what's already saved, free up the current saved line and save the
+         current contents of rl_line_buffer.  Bug reported by
+         llattanzi@apple.com

diff --git a/configure.in b/configure.in
index f58757b8ab1c41855f8754b8fa2690b38d8a47dd..01e070d4d419bb85fd55ebf1b1237c78ed8e6dd1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -22,10 +22,10 @@ dnl Process this file with autoconf to produce a configure script.
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-AC_REVISION([for Bash 3.0, version 3.164, from autoconf version] AC_ACVERSION)dnl
+AC_REVISION([for Bash 3.0, version 3.165, from autoconf version] AC_ACVERSION)dnl
 
 define(bashvers, 3.0)
-define(relstatus, rc1)
+define(relstatus, release)
 
 AC_INIT(bash, bashvers-relstatus, bug-bash@gnu.org)
 

diff --git a/lib/readline/misc.c b/lib/readline/misc.c
index f5541235689c6ab94dc6d56d9e7feacab670e381..ab1e1337fd3ab88b1a8a5094fe96d65e7d1d3aad 100644 (file)
--- a/lib/readline/misc.c
+++ b/lib/readline/misc.c
@@ -276,6 +276,13 @@ rl_maybe_save_line ()
       _rl_saved_line_for_history->line = savestring (rl_line_buffer);
       _rl_saved_line_for_history->data = (char *)rl_undo_list;
     }
+  else if (STREQ (rl_line_buffer, _rl_saved_line_for_history->line) == 0)
+    {
+      free (_rl_saved_line_for_history->line);
+      _rl_saved_line_for_history->line = savestring (rl_line_buffer);
+      _rl_saved_line_for_history->data = (char *)rl_undo_list; /* XXX possible memleak */
+    }
+
   return 0;
 }
 
@@ -439,6 +446,7 @@ rl_get_previous_history (count, key)
       rl_replace_from_history (temp, 0);
       _rl_history_set_point ();
     }
+
   return 0;
 }
 

diff --git a/tests/run-jobs b/tests/run-jobs
index e53ecd580a7f3edf4c89455218297dfa52278517..ddd7d5579e5305cffe3dc7f3f833a6a34960aa8b 100644 (file)
--- a/tests/run-jobs
+++ b/tests/run-jobs
@@ -1,5 +1,7 @@
 echo "warning: some of these tests may fail if job control has not been compiled" >&2
 echo "warning: into the shell" >&2
+echo "warning: there may be a message regarding a cat process dying due to a" >&2
+echo "warning: SIGUP.  Please disregard." >&2
 
 ${THIS_SH} ./jobs.tests > /tmp/xx 2>&1
 diff /tmp/xx jobs.right && rm -f /tmp/xx