diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/main.c | 22 |
2 files changed, 6 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog index c51a351..70a8065 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,7 @@ * Changed boolean rootshell into shlvl counter. * Catch set -e exits within built-in commands. - * Size optimisations with state/s in main(). + * Size optimisations with setjmp in main(). * Only reread exitstatus on EXEXIT in exitshell. * Eliminated global exerrno. diff --git a/src/main.c b/src/main.c index c686a13..6253010 100644 --- a/src/main.c +++ b/src/main.c @@ -123,30 +123,18 @@ main(int argc, char **argv) #endif state = 0; if (unlikely(setjmp(jmploc.loc))) { - int status; int e; int s; reset(); - s = state; e = exception; - switch (exception) { - case EXERROR: - status = 2; - break; - - case EXEXIT: - case EXEVAL: - s = 0; - /* fall through */ - default: - status = exitstatus; - break; - } - exitstatus = status; + if (e == EXERROR) + exitstatus = 2; - if (s == 0 || iflag == 0 || shlvl) + s = state; + if (e == EXEXIT || e == EXEVAL || + s == 0 || iflag == 0 || shlvl) exitshell(); if (e == EXINT |