commit bash-20130727 snapshot

diff --git a/builtins/fc.def b/builtins/fc.def
index 19583684419699254ad007829a2573ad7e8d8f60..6394a6294d41642393f913f0d2fa73f18a057841 100644 (file)
--- a/builtins/fc.def
+++ b/builtins/fc.def
@@ -475,7 +475,7 @@ fc_gethnum (command, hlist)
      HIST_ENTRY **hlist;
 {
   int sign, n, clen, rh;
-  register int i, j, last_hist;
+  register int i, j, last_hist, real_last;
   register char *s;
 
   sign = 1;
@@ -503,6 +503,7 @@ fc_gethnum (command, hlist)
   if (last_hist < 0)
     return (-1);
 
+  real_last = i;
   i = last_hist;
 
   /* No specification defaults to most recent command. */

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/array.right b/tests/array.right
index 4bcd29af0585933755c3587d05bb066b3801ce0d..593ab3794533a033bd56556306563a22e7e18ac9 100644 (file)
--- a/tests/array.right
+++ b/tests/array.right
@@ -375,6 +375,8 @@ declare -a x='([0]="0" [1]="1" [2]="2" [3]="3" [4]="4" [5]="5foo")'
 declare -a x='([0]="0" [1]="1" [2]="2" [3]="3" [4]="4" [5]="5")'
 declare -a x='([0]="0" [1]="1" [2]="2" [3]="3" [4]="4four" [5]="5")'
 strlen(4four) = 5
+1 2 xx 3
 1 2 0 3
+1 2 xx 3
 1 2 0 3
-1 2 0 3
+1 2 xx 3