commit bash-20080124 snapshot

diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog
index 3f001385a4f394ee40ae5930fc34790140e8ae50..41aab0a14b676825735eef8ea4346513096ab35e 100644 (file)
--- a/CWRU/CWRU.chlog
+++ b/CWRU/CWRU.chlog
@@ -15242,7 +15242,9 @@ lib/readline/{misc,readline,vi_mode,vi_keymap}.c
 builtins/read.def
        - change timeout behavior when not reading from a tty device to save
          any partial input in the variable list, but still return failure.
-         Fix inspired by Brian Craft <bcboy@thecraftstudio.com>
+         This also causes variables specified as arguments to read to be
+         set to null when there is no input available.  Fix inspired by
+         Brian Craft <bcboy@thecraftstudio.com>
 
                                   1/21
                                   ----
@@ -15250,3 +15252,9 @@ builtins/fc.def
        - change computation of last_hist to use remember_on_history instead
          of a hard-coded `1'.  This keeps fc -l -1 in PROMPT_COMMAND from
          looking too far back
+
+                                  1/25
+                                  ----
+lib/readline/complete.c
+       - fix fnwidth to use string[pos] instead of *string when testing the
+         current character for a control character or rubout

diff --git a/CWRU/CWRU.chlog~ b/CWRU/CWRU.chlog~
index 78991a64644cb1a56508fe8cb84594b88a47edff..5df0b09004bfc295dba6a9f12370a6fa9853a569 100644 (file)
--- a/CWRU/CWRU.chlog~
+++ b/CWRU/CWRU.chlog~
@@ -15242,4 +15242,13 @@ lib/readline/{misc,readline,vi_mode,vi_keymap}.c
 builtins/read.def
        - change timeout behavior when not reading from a tty device to save
          any partial input in the variable list, but still return failure.
-         Fix inspired by Brian Craft <bcboy@thecraftstudio.com>
+         This also causes variables specified as arguments to read to be
+         set to null when there is no input available.  Fix inspired by
+         Brian Craft <bcboy@thecraftstudio.com>
+
+                                  1/21
+                                  ----
+builtins/fc.def
+       - change computation of last_hist to use remember_on_history instead
+         of a hard-coded `1'.  This keeps fc -l -1 in PROMPT_COMMAND from
+         looking too far back

diff --git a/lib/readline/complete.c b/lib/readline/complete.c
index 64e4a235d67aa6679d843d37d1c95fae5e5865e0..aa3b9755cd234e95d81924b62a6a6ef9ea9dae78 100644 (file)
--- a/lib/readline/complete.c
+++ b/lib/readline/complete.c
@@ -599,7 +599,7 @@ fnwidth (string)
   width = pos = 0;
   while (string[pos])
     {
-      if (CTRL_CHAR (*string) || *string == RUBOUT)
+      if (CTRL_CHAR (string[pos]) || string[pos] == RUBOUT)
        {
          width += 2;
          pos++;

diff --git a/lib/readline/complete.c~ b/lib/readline/complete.c~
index 90528bc63edad01c4d5a76d30e9adefdcc35ec37..64e4a235d67aa6679d843d37d1c95fae5e5865e0 100644 (file)
--- a/lib/readline/complete.c~
+++ b/lib/readline/complete.c~
@@ -416,6 +416,7 @@ set_completion_defaults (what_to_do)
   rl_filename_quoting_desired = 1;
   rl_completion_type = what_to_do;
   rl_completion_suppress_append = rl_completion_suppress_quote = 0;
+  rl_completion_append_character = ' ';
 
   /* The completion entry function may optionally change this. */
   rl_completion_mark_symlink_dirs = _rl_complete_mark_symlink_dirs;
@@ -438,7 +439,7 @@ get_y_or_n (for_pager)
        return (1);
       if (c == 'n' || c == 'N' || c == RUBOUT)
        return (0);
-      if (c == ABORT_CHAR)
+      if (c == ABORT_CHAR || c < 0)
        _rl_abort_internal ();
       if (for_pager && (c == NEWLINE || c == RETURN))
        return (2);

diff --git a/tests/RUN-ONE-TEST b/tests/RUN-ONE-TEST
index 72ec06a2c1fd8dde92acea5e8ac773e35f1d061b..3efcf32d68e9722024b6ca9d67f9e81b2aa5ac04 100755 (executable)
--- a/tests/RUN-ONE-TEST
+++ b/tests/RUN-ONE-TEST
@@ -1,4 +1,4 @@
-BUILD_DIR=/usr/local/build/bash/bash-current
+BUILD_DIR=/usr/local/build/chet/bash/bash-current
 THIS_SH=$BUILD_DIR/bash
 PATH=$PATH:$BUILD_DIR
 

diff --git a/tests/read.right b/tests/read.right
index 8f0b2bffdbd853355be8298c47314e0aacb1cb29..ae405a259247d4a330a0242df34afba0edca604d 100644 (file)
--- a/tests/read.right
+++ b/tests/read.right
@@ -34,12 +34,12 @@ a = xyz
 a = -xyz 123-
 a = abc
 1
-4
+
 1
-4
+
 ./read2.sub: line 13: read: -3: invalid timeout specification
 1
-4
+
 abcde
 ./read3.sub: line 4: read: -1: invalid number
 abc