stdout not proper if EXIT/ERR traphandler defined in commandline mode

att#36
citrus-it · Jan 5, 2021 · aeee2c8 · aeee2c8
1 parent b4f25be
commit aeee2c8
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 1 deletion.
diff --git a/src/cmd/ksh93/bltins/trap.c b/src/cmd/ksh93/bltins/trap.c
@@ -127,6 +127,17 @@ int	b_trap(int argc,char *argv[],Shbltin_t *context)
 						shp->trapnote |= SH_SIGTRAP;
 					else
 						shp->trapnote = 0;
+
+				}
+				if(sig == SH_ERRTRAP)
+				{
+					if(clear)
+						shp->errtrap = 0;
+					else
+					{
+						if(!shp->fn_depth || shp->end_fn)
+							shp->errtrap = 1;
+					}
 				}
 				continue;
 			}
@@ -144,6 +155,8 @@ int	b_trap(int argc,char *argv[],Shbltin_t *context)
 			else if(clear)
 			{
 				sh_sigclear(sig);
+				if(sig == 0)
+					shp->exittrap = 0;
 				if(dflag)
 					signal(sig,SIG_DFL);
 			}
@@ -156,6 +169,11 @@ int	b_trap(int argc,char *argv[],Shbltin_t *context)
 				shp->st.trapcom[sig] = (shp->sigflag[sig]&SH_SIGOFF) ? Empty : strdup(action);
 				if(arg && arg != Empty)
 					free(arg);
+				if(sig == 0)
+				{
+					if(!shp->fn_depth || shp->end_fn)
+						shp->exittrap = 1;
+				}
 			}
 		}
 	}

diff --git a/src/cmd/ksh93/include/defs.h b/src/cmd/ksh93/include/defs.h
@@ -268,7 +268,10 @@ struct shared
 	char		*mathnodes; \
 	void		*coshell; \
 	char		*bltin_dir; \
-	struct Regress_s*regress;
+	struct Regress_s*regress; \
+	char 		exittrap; \
+	char 		errtrap; \
+	char 		end_fn;
 
 #include	<shell.h>
 

diff --git a/src/cmd/ksh93/sh/init.c b/src/cmd/ksh93/sh/init.c
@@ -1585,6 +1585,9 @@ Shell_t *sh_init(register int argc,register char *argv[], Shinit_f userinit)
 #endif
 	if(shp->userinit=userinit)
 		(*userinit)(shp, 0);
+	shp->exittrap = 0;
+	shp->errtrap = 0;
+	shp->end_fn = 0;
 	return(shp);
 }
 
@@ -1686,6 +1689,9 @@ int sh_reinit(char *argv[])
 	shp->inpipe = shp->outpipe = 0;
 	job_clear();
 	job.in_critical = 0;
+	shp->exittrap = 0;
+	shp->errtrap = 0;
+	shp->end_fn = 0;
 	return(1);
 }
 

diff --git a/src/cmd/ksh93/sh/main.c b/src/cmd/ksh93/sh/main.c
@@ -466,6 +466,9 @@ static void	exfile(register Shell_t *shp, register Sfio_t *iop,register int fno)
 	error_info.line = 1;
 	shp->inlineno = 1;
 	shp->binscript = 0;
+	shp->exittrap = 0;
+	shp->errtrap = 0;
+	shp->end_fn = 0;
 	if(sfeof(iop))
 		goto eof_or_error;
 	/* command loop */

diff --git a/src/cmd/ksh93/sh/xec.c b/src/cmd/ksh93/sh/xec.c
@@ -1020,6 +1020,8 @@ int sh_exec(register const Shnode_t *t, int flags)
 		shp->exitval=0;
 		shp->lastsig = 0;
 		shp->lastpath = 0;
+		if(shp->exittrap || shp->errtrap)
+			execflg = 0;
 		switch(type&COMMSK)
 		{
 		    case TCOM:
@@ -3410,6 +3412,8 @@ int sh_funscope(int argn, char *argv[],int(*fun)(void*),void *arg,int execflg)
 		nv_putval(SH_PATHNAMENOD,shp->st.filename,NV_NOFREE);
 		nv_putval(SH_FUNNAMENOD,shp->st.funname,NV_NOFREE);
 	}
+	if((execflg & sh_state(SH_NOFORK)))
+		shp->end_fn = 1;
 	jmpval = sigsetjmp(buffp->buff,0);
 	if(jmpval == 0)
 	{
@@ -3457,6 +3461,7 @@ int sh_funscope(int argn, char *argv[],int(*fun)(void*),void *arg,int execflg)
 	shp->st = *prevscope;
 	shp->topscope = (Shscope_t*)prevscope;
 	nv_getval(sh_scoped(shp,IFSNOD));
+	shp->end_fn = 0;
 	if(nsig)
 		memcpy((char*)&shp->st.trapcom[0],savstak,nsig);
 	shp->trapnote=0;