diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2011-01-07 10:05:35 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2011-01-07 10:05:35 +0000 |
| commit | a89f0559c210def9a40bfeb9da6b38128a49cb55 (patch) | |
| tree | aa6bb2e44e5e7a842c4d78be3a71c6854b12b2ea | |
| parent | 21ee383e28f1e0fb31be0aa0c2d9a0cba26ccc8e (diff) | |
| download | zsh-a89f0559c210def9a40bfeb9da6b38128a49cb55.tar.gz zsh-a89f0559c210def9a40bfeb9da6b38128a49cb55.tar.xz zsh-a89f0559c210def9a40bfeb9da6b38128a49cb55.zip | |
28590: make read return status non-zero on error
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/builtin.c | 7 | ||||
| -rw-r--r-- | Test/B04read.ztst | 5 |
3 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index fddf16222..68aad4aba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-01-07 Peter Stephenson <pws@csr.com> + * 28590 (added a comment): Src/builtin.c, Test/B04read.ztst: + read builtin should return non-zero status on error. + * Mikael: 28585: Completion/Unix/Command/_mkdir: don't set ret=0 when _wanted fails to find any matches. @@ -14066,5 +14069,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5174 $ +* $Revision: 1.5175 $ ***************************************************** diff --git a/Src/builtin.c b/Src/builtin.c index 411b834e7..a85a49a20 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -5710,7 +5710,12 @@ bin_read(char *name, char **args, Options ops, UNUSED(int func)) } return 1; } - return 0; + /* + * The following is to ensure a failure to set the parameter + * causes a non-zero status return. There are arguments for + * turning a non-zero status into errflag more widely. + */ + return errflag; } /**/ diff --git a/Test/B04read.ztst b/Test/B04read.ztst index 2c87aa67a..ad427dc0d 100644 --- a/Test/B04read.ztst +++ b/Test/B04read.ztst @@ -88,3 +88,8 @@ print ${#line} 0:read with trailing metafied characters >24 + + (typeset -r foo + read foo) <<<bar +1:return status on failing to set parameter +?(eval):2: read-only variable: foo |