Herbert Xu wrote:
> Actually the bug is elsewhere.
It does bisect to there. :) But you're right, it would have been
simpler to send one patch.
> --- a/src/eval.c
> +++ b/src/eval.c
> @@ -854,7 +854,7 @@ bail:
> int i;
>
> i = exception;
> - if (i == EXEXIT)
> + if (i == EXEXIT || i == EXEXEC)
> goto raise;
Good call. This is better than my patch because it exits like it
ought to for
command exec nonexistent
(as POSIX says:
If command is specified, exec shall not return to the shell
).
Maybe the following would make sense on top?
-- 8< --
Subject: [EXCEPTIONS] Use EXEXIT in place of EXEXEC
The intended semantics of EXEXEC are identical to EXEXIT, so
simplify by using EXEXIT directly.
Functional change: in edge cases (exec within a trap handler),
this causes the exit status from exec not to be clobbered.
For example, without this patch:
$ sh -c 'trap "exec nonexistent" EXIT'; echo $?
exec: 1: nonexistent: not found
0
And with it:
$ sh -c 'trap "exec nonexistent" EXIT'; echo $?
exec: 1: nonexistent: not found
127
Signed-off-by: Jonathan Nieder <[email protected]>
---
src/error.h | 1 -
src/eval.c | 2 +-
src/exec.c | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/error.h b/src/error.h
index be0eec9..f236d9f 100644
--- a/src/error.h
+++ b/src/error.h
@@ -66,7 +66,6 @@ extern int exception;
/* exceptions */
#define EXINT 0 /* SIGINT received */
#define EXERROR 1 /* a generic error */
-#define EXEXEC 3 /* command execution failed */
#define EXEXIT 4 /* exit the shell */
diff --git a/src/eval.c b/src/eval.c
index b966749..5b8d36b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -854,7 +854,7 @@ bail:
int i;
i = exception;
- if (i == EXEXIT || i == EXEXEC)
+ if (i == EXEXIT)
goto raise;
status = (i == EXINT) ? SIGINT + 128 : 2;
diff --git a/src/exec.c b/src/exec.c
index 42299ea..b273420 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -141,7 +141,7 @@ shellexec(char **argv, const char *path, int idx)
exitstatus = exerrno;
TRACE(("shellexec failed for %s, errno %d, suppressint %d\n",
argv[0], e, suppressint ));
- exerror(EXEXEC, "%s: %s", argv[0], errmsg(e, E_EXEC));
+ exerror(EXEXIT, "%s: %s", argv[0], errmsg(e, E_EXEC));
/* NOTREACHED */
}
--
1.7.2.3
--
To unsubscribe from this list: send the line "unsubscribe dash" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
