sh_ntfork(): handle SIGTSTP along with SIGTTIN and SIGTTOU

McDutchie · McDutchie · commit fa3a3d795507 · 2021-02-02T04:25:46.000Z
This applies a patch from OpenSUSE that makes SIGTSTP handling consistent with that of SIGTTIN and SIGTTOU. https://build.opensuse.org/package/view_file/shells/ksh/ksh93-signals.dif
diff --git a/src/cmd/ksh93/sh/xec.c b/src/cmd/ksh93/sh/xec.c
@@ -3573,6 +3573,7 @@ static pid_t sh_ntfork(Shell_t *shp,const Shnode_t *t,char *argv[],int *jobid,in
 				{
 					signal(SIGTTIN,SIG_DFL);
 					signal(SIGTTOU,SIG_DFL);
+					signal(SIGTSTP,SIG_DFL);
 				}
 #endif /* SIGTSTP */
 #ifdef JOBS
@@ -3610,6 +3611,10 @@ static pid_t sh_ntfork(Shell_t *shp,const Shnode_t *t,char *argv[],int *jobid,in
 			{
 				signal(SIGTTIN,SIG_IGN);
 				signal(SIGTTOU,SIG_IGN);
+				if(sh_isstate(SH_INTERACTIVE))
+					signal(SIGTSTP,SIG_IGN);
+				else
+					signal(SIGTSTP,SIG_DFL);
 			}
 #endif /* SIGTSTP */
 			if(spawnpid>0)
@@ -3695,6 +3700,7 @@ static pid_t sh_ntfork(Shell_t *shp,const Shnode_t *t,char *argv[],int *jobid,in
 		{
 			signal(SIGTTIN,SIG_DFL);
 			signal(SIGTTOU,SIG_DFL);
+			signal(SIGTSTP,SIG_DFL);
 			jobwasset++;
 		}
 #endif /* SIGTSTP */
@@ -3758,6 +3764,10 @@ static pid_t sh_ntfork(Shell_t *shp,const Shnode_t *t,char *argv[],int *jobid,in
 	{
 		signal(SIGTTIN,SIG_IGN);
 		signal(SIGTTOU,SIG_IGN);
+		if(sh_isstate(SH_INTERACTIVE))
+			signal(SIGTSTP,SIG_IGN);
+		else
+			signal(SIGTSTP,SIG_DFL);
 	}
 #endif /* SIGTSTP */
 	if(sigwasset)

Original file line number	Diff line number	Diff line change
`@@ -3573,6 +3573,7 @@ static pid_t sh_ntfork(Shell_t shp,const Shnode_t t,char argv[],int jobid,in`
`3573`	`3573`	`{`
`3574`	`3574`	`signal(SIGTTIN,SIG_DFL);`
`3575`	`3575`	`signal(SIGTTOU,SIG_DFL);`
	`3576`	`+ signal(SIGTSTP,SIG_DFL);`
`3576`	`3577`	`}`
`3577`	`3578`	`#endif /* SIGTSTP */`
`3578`	`3579`	`#ifdef JOBS`
`@@ -3610,6 +3611,10 @@ static pid_t sh_ntfork(Shell_t shp,const Shnode_t t,char argv[],int jobid,in`
`3610`	`3611`	`{`
`3611`	`3612`	`signal(SIGTTIN,SIG_IGN);`
`3612`	`3613`	`signal(SIGTTOU,SIG_IGN);`
	`3614`	`+ if(sh_isstate(SH_INTERACTIVE))`
	`3615`	`+ signal(SIGTSTP,SIG_IGN);`
	`3616`	`+ else`
	`3617`	`+ signal(SIGTSTP,SIG_DFL);`
`3613`	`3618`	`}`
`3614`	`3619`	`#endif /* SIGTSTP */`
`3615`	`3620`	`if(spawnpid>0)`
`@@ -3695,6 +3700,7 @@ static pid_t sh_ntfork(Shell_t shp,const Shnode_t t,char argv[],int jobid,in`
`3695`	`3700`	`{`
`3696`	`3701`	`signal(SIGTTIN,SIG_DFL);`
`3697`	`3702`	`signal(SIGTTOU,SIG_DFL);`
	`3703`	`+ signal(SIGTSTP,SIG_DFL);`
`3698`	`3704`	`jobwasset++;`
`3699`	`3705`	`}`
`3700`	`3706`	`#endif /* SIGTSTP */`
`@@ -3758,6 +3764,10 @@ static pid_t sh_ntfork(Shell_t shp,const Shnode_t t,char argv[],int jobid,in`
`3758`	`3764`	`{`
`3759`	`3765`	`signal(SIGTTIN,SIG_IGN);`
`3760`	`3766`	`signal(SIGTTOU,SIG_IGN);`
	`3767`	`+ if(sh_isstate(SH_INTERACTIVE))`
	`3768`	`+ signal(SIGTSTP,SIG_IGN);`
	`3769`	`+ else`
	`3770`	`+ signal(SIGTSTP,SIG_DFL);`
`3761`	`3771`	`}`
`3762`	`3772`	`#endif /* SIGTSTP */`
`3763`	`3773`	`if(sigwasset)`