emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: fix "ash -c 'exec 1>&0'" complaining that fd 0 is busy

Browse Source
This commit is contained in:
Denis Vlasenko 2009-03-19 01:59:59 +00:00
parent c1969f69b1
commit 5c2b81470d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
shell/ash.c
View File

@ -11684,7 +11684,8 @@ expandstr(const char *ps)
{ {
union node n; union node n;
/* XXX Fix (char *) cast. */ /* XXX Fix (char *) cast. It _is_ a bug. ps is variable's value,
* and token processing _can_ alter it (delete NULs etc). */
setinputstring((char *)ps); setinputstring((char *)ps);
readtoken1(pgetc(), PSSYNTAX, nullstr, 0); readtoken1(pgetc(), PSSYNTAX, nullstr, 0);
popfile(); popfile();
@ -13802,15 +13803,20 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
} }
state3: state3:
state = 4; state = 4;
if (minusc) if (minusc) {
/* evalstring pushes parsefile stack.
* Ensure we don't falsely claim that 0 (stdin)
* is one of stacked source fds */
if (!sflag)
g_parsefile->fd = -1;
evalstring(minusc, 0); evalstring(minusc, 0);
}
if (sflag || minusc == NULL) { if (sflag || minusc == NULL) {
#if ENABLE_FEATURE_EDITING_SAVEHISTORY #if ENABLE_FEATURE_EDITING_SAVEHISTORY
if (iflag) { if (iflag) {
const char *hp = lookupvar("HISTFILE"); const char *hp = lookupvar("HISTFILE");
if (hp)
if (hp != NULL)
line_input_state->hist_file = hp; line_input_state->hist_file = hp;
} }
#endif #endif