about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2014-11-23 16:02:48 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2014-11-23 16:02:48 -0800
commit2b615bedaff1d64a1521972717a91058c74b579f (patch)
tree4027c546fe99cdbc1adb76d1542b1db81245424d
parenta526a2203b26cb6b9d3546b92761f3b2217805ef (diff)
downloadzsh-2b615bedaff1d64a1521972717a91058c74b579f.tar.gz
zsh-2b615bedaff1d64a1521972717a91058c74b579f.tar.xz
zsh-2b615bedaff1d64a1521972717a91058c74b579f.zip
33775: error opening file in $(<...) is not fatal
-rw-r--r--ChangeLog4
-rw-r--r--Src/exec.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a11982965..d59c99290 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-23  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 33775: Src/exec.c: error opening file in $(<...) is not fatal
+
 2014-11-23  Oliver Kiddle  <opk@zsh.org>
 
 	* 33743: Src/Modules/zpty.c, configure.ac: use posix_openpt
diff --git a/Src/exec.c b/Src/exec.c
index 042215d34..02a8fe3ad 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -3840,8 +3840,8 @@ getoutput(char *cmd, int qt)
 	    return NULL;
 	untokenize(s);
 	if ((stream = open(unmeta(s), O_RDONLY | O_NOCTTY)) == -1) {
-	    zerr("%e: %s", errno, s);
-	    return NULL;
+	    zwarn("%e: %s", errno, s);
+	    return newlinklist();
 	}
 	return readoutput(stream, qt);
     }