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

Simplify comsub logic (re: 970069a6, 4ce486a7)

Browse source 
There was still an opportunity for code simplification.
No change in behaviour.
This commit is contained in:
Martijn Dekker 2020-09-24 15:43:49 +02:00
parent a14d17c0f4
commit e40aaa8aa8
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1528,14 +1528,11 @@ int sh_exec(register const Shnode_t *t, int flags)
if(shp->subshell) if(shp->subshell)
{ {
sh_subtmpfile(2); sh_subtmpfile(2);
if(shp->comsub==1 && (!(shp->fdstatus[1]&IONOSEEK))) if((shp->comsub && (type&(FAMP|TFORK))==(FAMP|TFORK) || shp->comsub==1) &&
!(shp->fdstatus[1]&IONOSEEK))
unpipe = iousepipe(shp); unpipe = iousepipe(shp);
if((type&(FAMP|TFORK))==(FAMP|TFORK)) if((type&(FAMP|TFORK))==(FAMP|TFORK))
{
if(shp->comsub && !(shp->fdstatus[1]&IONOSEEK) && !unpipe)
unpipe = iousepipe(shp);
sh_subfork(); sh_subfork();
}
} }
no_fork = !ntflag && !(type&(FAMP|FPOU)) && !shp->subshell && no_fork = !ntflag && !(type&(FAMP|FPOU)) && !shp->subshell &&
!(shp->st.trapcom[SIGINT] && *shp->st.trapcom[SIGINT]) && !(shp->st.trapcom[SIGINT] && *shp->st.trapcom[SIGINT]) &&