diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-08-11 20:56:53 +1000 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2009-08-11 20:56:53 +1000 |
commit | d53f173bb00bcc1d89ceb9e82b7d7e2b2a8dd852 (patch) | |
tree | 7054b149105e685666c0a57d1e53e3d03a1709f2 /src/main.c | |
parent | [EVAL] Pass EV_TESTED into evalcmd (diff) | |
download | dash-d53f173bb00bcc1d89ceb9e82b7d7e2b2a8dd852.tar.gz dash-d53f173bb00bcc1d89ceb9e82b7d7e2b2a8dd852.zip |
[EVAL] Revert SKIPEVAL into EXEXIT
Now that eval handles EV_TESTED correctly, we can remove the SKIPEVAL hack and simply use EXEXIT for set -e. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/main.c b/src/main.c index 7d07e2d..2bff956 100644 --- a/src/main.c +++ b/src/main.c @@ -243,7 +243,7 @@ cmdloop(int top) skip = evalskip; if (skip) { evalskip = 0; - return skip & SKIPEVAL; + break; } } @@ -259,17 +259,12 @@ cmdloop(int top) STATIC void read_profile(const char *name) { - int skip; - name = expandstr(name); if (setinputfile(name, INPUT_PUSH_FILE | INPUT_NOFILE_OK) < 0) return; - skip = cmdloop(0); + cmdloop(0); popfile(); - - if (skip) - exitshell(); } |