commit bash-20170607 snapshot

4 files changed, 26 insertions, 10 deletions

diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog
index c9f8acad..3e9cee66 100644
--- a/CWRU/CWRU.chlog
+++ b/CWRU/CWRU.chlog
@@ -14020,3 +14020,17 @@ variables.c
 	  regenerate attribute set, call the dynamic value function to generate
 	  an updated value before placing it in the environment.  From a report
 	  about exporting LINENO from by Robert Elz <kre@bmunnari.OZ.AU>
+
+				    6/4
+				    ---
+lib/glob/sm_loop.c
+	- BRACKMATCH: at the matched: label, make sure we get the bracket
+	  character we're looking for (char class, collating symbol. etc.)
+	  before we decrement the count of braces we're looking for. Eventually
+	  we could do something about badly-formed bracket expressions
+
+				    6/7
+				    ---
+lib/readline/histlib.h
+	- strchr: only declare if  __STDC__ is not defined, since we already
+	  include <string.h>.  Report from Chi-Hsuan Yen <yan12125@gmail.com>
diff --git a/lib/readline/histlib.h b/lib/readline/histlib.h
index 9986a2e4..9627b245 100644
--- a/lib/readline/histlib.h
+++ b/lib/readline/histlib.h
@@ -51,9 +51,9 @@
 #endif
 
 #ifndef member
-#  ifndef strchr
+#  if !defined (strchr) && !defined (__STDC__)
 extern char *strchr ();
-#  endif
+#  endif /* !strchr && !__STDC__ */
 #define member(c, s) ((c) ? ((char *)strchr ((s), (c)) != (char *)NULL) : 0)
 #endif
 
diff --git a/tests/arith-for.right b/tests/arith-for.right
index 640a50d0..5c09070b 100644
--- a/tests/arith-for.right
+++ b/tests/arith-for.right
@@ -64,11 +64,11 @@ fx ()
 0
 1
 2
-/usr/local/build/chet/bash/bash-current/bash: -c: line 0: syntax error: arithmetic expression required
-/usr/local/build/chet/bash/bash-current/bash: -c: line 0: syntax error: `(( i=0; "i < 3" ))'
+bash: -c: line 0: syntax error: arithmetic expression required
+bash: -c: line 0: syntax error: `(( i=0; "i < 3" ))'
 2
-/usr/local/build/chet/bash/bash-current/bash: -c: line 0: syntax error: `;' unexpected
-/usr/local/build/chet/bash/bash-current/bash: -c: line 0: syntax error: `(( i=0; i < 3; i++; 7 ))'
+bash: -c: line 0: syntax error: `;' unexpected
+bash: -c: line 0: syntax error: `(( i=0; i < 3; i++; 7 ))'
 2
 20
 20
diff --git a/tests/arith-for.tests b/tests/arith-for.tests
index 42b8aad8..33f4bd66 100644
--- a/tests/arith-for.tests
+++ b/tests/arith-for.tests
@@ -74,17 +74,19 @@ type fx
 fx
 
 # errors 
+{
 ${THIS_SH} -c 'for (( i=0; "i < 3" ))
 do
 	echo $i
-done'
-echo $?
+done' ; echo $? ;  } 2>&1 | sed 's|^.*/||'
+#echo $?
 
+{
 ${THIS_SH} -c 'for (( i=0; i < 3; i++; 7 ))
 do
 	echo $i
-done'
-echo $?
+done' ; echo $?; } 2>&1 | sed 's|^.*/||'
+#echo $?
 
 # one-liners added in post-bash-2.04
 for     ((i=0; i < 20; i++)) do : ; done