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

Revert "Fix SIGALRM core dump (Solaris patch 230-18229654)"

Browse source 
This reverts commit 13e7b262. It caused the regression test for the
'alarm' builtin, introduced in 18b3f4aa, to hang on FreeBSD.
This commit is contained in:
Martijn Dekker 2021-01-09 13:18:00 +00:00
parent 7d2bb8fdd9
commit 4d0b77d398
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/ksh93/bltins/alarm.c
View file

@ -134,7 +134,7 @@ static void trap_timeout(void* handle)
tp->timeout = 0;
tp->flags |= L_FLAG;
tp->sh->sigflag[SIGALRM] |= SH_SIGALRM;
if(sh_isstate(SH_TTYWAIT) && !tp->sh->bltinfun)
if(sh_isstate(SH_TTYWAIT))
sh_timetraps(tp->sh);
}

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

@ -2643,11 +2643,6 @@ int sh_exec(register const Shnode_t *t, int flags)
break;
}
}
if(shp->trapnote&SH_SIGALRM)
{
shp->trapnote &= ~SH_SIGALRM;
sh_timetraps(shp);
}
if(shp->trapnote || (shp->exitval && sh_isstate(SH_ERREXIT)) &&
t && echeck)
sh_chktrap(shp);