diff options
| author | Gerrit Pape <pape@smarden.org> | 2010-11-28 20:32:00 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-11-28 20:32:00 +0800 |
| commit | 34f60a3781ea8f17f3d2a1a743a9aab9b31a296f (patch) | |
| tree | 36994f076693fe0b5771c859934f912a5906d31d | |
| parent | [ERROR] Allow the originator of EXERROR to set the exit status (diff) | |
| download | dash-34f60a3781ea8f17f3d2a1a743a9aab9b31a296f.tar.gz dash-34f60a3781ea8f17f3d2a1a743a9aab9b31a296f.zip | |
[INPUT] Use exit status 127 when the script to run does not exist
This commit makes dash exit with return code 127 instead of 2 if started as non-interactive shell with a non-existent command_file specified as argument (or a directory), as documented in http://www.opengroup.org/onlinepubs/009695399/utilities/sh.html#tag_04_128_14 The wrong exit code was reported by Clint Adams and Jari Aalto through http://bugs.debian.org/548743 http://bugs.debian.org/548687 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/input.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index e5479a8..a18838c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-11-28 Gerrit Pape <pape@smarden.org> + + * Use exit status 127 when the script to run does not exist. + 2010-11-28 Philipp Weis <pweis@pweis.com> * Document optional open parenthesis for case patterns. diff --git a/src/input.c b/src/input.c index e57ad76..bd3a9a2 100644 --- a/src/input.c +++ b/src/input.c @@ -42,6 +42,7 @@ * This file implements the input routines used by the parser. */ +#include "eval.h" #include "shell.h" #include "redir.h" #include "syntax.h" @@ -408,7 +409,8 @@ setinputfile(const char *fname, int flags) if ((fd = open(fname, O_RDONLY)) < 0) { if (flags & INPUT_NOFILE_OK) goto out; - sh_error("Can't open %s", fname); + exitstatus = 127; + exerror(EXERROR, "Can't open %s", fname); } if (fd < 10) fd = savefd(fd, fd); |