external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Fix 'redirect {var}>file' in subshell (re: 7b82c338)

Browse source 
Permanent redirections of that form broke in subshells when used
with the 'redirect' command, because I had overlooked one instance
where the new 'redirect' builtin needs to match the behaviour of
the 'exec' builtin.

src/cmd/ksh93/tests/io.sh: sh_exec():
- Do not restore file descriptors in (virtual) subshells for
  'redirect' just as this isn't done for 'exec'.

src/cmd/ksh93/tests/io.sh:
- Add regression test for this bug.
- Complete the test for f9427909 which I committed prematurely.

Fixes: https://github.com/ksh93/ksh/issues/167
This commit is contained in:
Martijn Dekker 2021-02-05 05:38:38 +00:00
parent f9427909dc
commit 7b59fb805c
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmd/ksh93/sh/xec.c
View file

@ -1401,8 +1401,8 @@ int sh_exec(register const Shnode_t *t, int flags)
sh_unscope(shp);
bp->ptr = (void*)save_ptr;
bp->data = (void*)save_data;
/* don't restore for subshell exec */
if((shp->topfd>topfd) && !(shp->subshell && np==SYSEXEC))
/* don't restore for 'exec' or 'redirect' in subshell */
if((shp->topfd>topfd) && !(shp->subshell && (np==SYSEXEC || np==SYSREDIR)))
sh_iorestore(shp,topfd,jmpval);
shp->redir0 = 0;