summary refs log tree commit diff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2016-11-29 12:35:57 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2016-11-29 12:35:57 -0800
commit3ba86f4db44e6b5f854909fbc639ef3111ec176b (patch)
tree64e86a987e4c28b0d617efe494c8a72331db90d0
parenta9fe87e18cbe37d938fb1a02f71f8f905141e0f4 (diff)
downloadzsh-3ba86f4db44e6b5f854909fbc639ef3111ec176b.tar.gz
zsh-3ba86f4db44e6b5f854909fbc639ef3111ec176b.tar.xz
zsh-3ba86f4db44e6b5f854909fbc639ef3111ec176b.zip
40034: clear badcshglob when ignoring errors
-rw-r--r--ChangeLog2
-rw-r--r--Src/subst.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ed44eb4c..3255bf6b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2016-11-29  Barton E. Schaefer  <schaefer@brasslantern.com>
 
+	* 40034: Src/subst.c: clear badcshglob when ignoring errors
+
 	* unposted: README: example describing 40032
 
 	* 40032: Src/params.c: consistency in handling of subscript
diff --git a/Src/subst.c b/Src/subst.c
index a26ebb1d6..06d2c9ea9 100644
--- a/Src/subst.c
+++ b/Src/subst.c
@@ -411,7 +411,9 @@ globlist(LinkList list, int nountok)
 	next = nextnode(node);
 	zglob(list, node, nountok);
     }
-    if (badcshglob == 1)
+    if (noerrs)
+	badcshglob = 0;
+    else if (badcshglob == 1)
 	zerr("no match");
 }