topjohnwu/ndk-busybox
1
0
Fork 0
mirror of https://github.com/topjohnwu/ndk-busybox.git synced 2024-11-25 04:39:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix subtle bug inherited from dash

Browse Source
This commit is contained in:
Denis Vlasenko 2007-01-18 01:12:57 +00:00
parent 41aaefce71
commit 7f0d7ae4f5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
shell/ash.c
View File

@ -11938,7 +11938,11 @@ exitshell(void)
TRACE(("pid %d, exitshell(%d)\n", getpid(), status)); TRACE(("pid %d, exitshell(%d)\n", getpid(), status));
if (setjmp(loc.loc)) { if (setjmp(loc.loc)) {
if (exception == EXEXIT) if (exception == EXEXIT)
_exit(exitstatus); /* dash bug: it just does _exit(exitstatus) here
* but we have to do setjobctl(0) first!
* (bug is still not fixed in dash-0.5.3 - if you run dash
* under Midnight Commander, on exit MC is backgrounded) */
status = exitstatus;
goto out; goto out;
} }
handler = &loc; handler = &loc;
@ -11947,16 +11951,16 @@ exitshell(void)
evalstring(p, 0); evalstring(p, 0);
} }
flushall(); flushall();
setjobctl(0);
#ifdef CONFIG_FEATURE_COMMAND_SAVEHISTORY #ifdef CONFIG_FEATURE_COMMAND_SAVEHISTORY
if (iflag && rootshell) { if (iflag && rootshell) {
const char *hp = lookupvar("HISTFILE"); const char *hp = lookupvar("HISTFILE");
if(hp != NULL ) if (hp != NULL)
save_history ( hp ); save_history(hp);
} }
#endif #endif
out: out:
setjobctl(0);
_exit(status); _exit(status);
/* NOTREACHED */ /* NOTREACHED */
} }