Blame SPECS/ksh-20120801-kshmfix.patch

Packit 992a25
diff -up ksh-20120801/src/cmd/ksh93/sh/main.c.monintoron ksh-20120801/src/cmd/ksh93/sh/main.c
Packit 992a25
--- ksh-20120801/src/cmd/ksh93/sh/main.c.monintoron	2013-05-31 10:15:02.738828102 +0200
Packit 992a25
+++ ksh-20120801/src/cmd/ksh93/sh/main.c	2013-05-31 10:15:36.057095262 +0200
Packit 992a25
@@ -406,10 +406,10 @@ static void	exfile(register Shell_t *shp
Packit 992a25
 		{
Packit 992a25
 			buff.mode = SH_JMPEXIT;
Packit 992a25
 			sh_onoption(SH_TRACKALL);
Packit 992a25
-			sh_offoption(SH_MONITOR);
Packit 992a25
 		}
Packit 992a25
 		sh_offstate(SH_INTERACTIVE);
Packit 992a25
-		sh_offstate(SH_MONITOR);
Packit 992a25
+		if(sh_isoption(SH_MONITOR))
Packit 992a25
+			sh_onstate(SH_MONITOR);
Packit 992a25
 		sh_offstate(SH_HISTORY);
Packit 992a25
 		sh_offoption(SH_HISTORY);
Packit 992a25
 	}
Packit 992a25
diff -up ksh-20120801/src/cmd/ksh93/sh/jobs.c.orig ksh-20120801/src/cmd/ksh93/sh/jobs.c
Packit 992a25
--- ksh-20120801/src/cmd/ksh93/sh/jobs.c.orig	2013-05-31 10:12:28.358590452 +0200
Packit 992a25
+++ ksh-20120801/src/cmd/ksh93/sh/jobs.c	2013-05-31 10:16:51.203697890 +0200
Packit 992a25
@@ -548,7 +548,7 @@ int job_reap(register int sig)
Packit 992a25
 		{
Packit 992a25
 			px = job_byjid((int)pw->p_job);
Packit 992a25
 			for(; px && (px->p_flag&P_DONE); px=px->p_nxtproc);
Packit 992a25
-			if(!px)
Packit 992a25
+			if(!px && sh_isoption(SH_INTERACTIVE))
Packit 992a25
 				tcsetpgrp(JOBTTY,job.mypid);
Packit 992a25
 		}
Packit 992a25
 #ifndef SHOPT_BGX
Packit 992a25
@@ -842,10 +842,11 @@ static void job_set(register struct proc
Packit 992a25
 
Packit 992a25
 static void job_reset(register struct process *pw)
Packit 992a25
 {
Packit 992a25
+	Shell_t *shp = pw->p_shp;
Packit 992a25
 	/* save the terminal state for current job */
Packit 992a25
 #ifdef SIGTSTP
Packit 992a25
 	job_fgrp(pw,tcgetpgrp(job.fd));
Packit 992a25
-	if(tcsetpgrp(job.fd,job.mypid) !=0)
Packit 992a25
+	if(sh_isoption(SH_INTERACTIVE) && tcsetpgrp(job.fd,job.mypid) !=0)
Packit 992a25
 		return;
Packit 992a25
 #endif	/* SIGTSTP */
Packit 992a25
 	/* force the following tty_get() to do a tcgetattr() unless fg */
Packit 992a25
diff -up ksh-20120801/src/cmd/ksh93/sh/xec.c.orig ksh-20120801/src/cmd/ksh93/sh/xec.c
Packit 992a25
--- ksh-20120801/src/cmd/ksh93/sh/xec.c.orig	2013-05-31 10:12:27.000000000 +0200
Packit 992a25
+++ ksh-20120801/src/cmd/ksh93/sh/xec.c	2013-05-31 10:18:14.650367185 +0200
Packit 992a25
@@ -2201,7 +2201,7 @@ int sh_exec(register const Shnode_t *t,
Packit 992a25
 			}
Packit 992a25
 			shp->exitval = n;
Packit 992a25
 #ifdef SIGTSTP
Packit 992a25
-			if(!pipejob && sh_isstate(SH_MONITOR))
Packit 992a25
+			if(!pipejob && sh_isstate(SH_MONITOR) && sh_isoption(SH_INTERACTIVE))
Packit 992a25
 				tcsetpgrp(JOBTTY,shp->gd->pid);
Packit 992a25
 #endif /*SIGTSTP */
Packit 992a25
 			job.curpgid = savepgid;
Packit 992a25
diff -up ksh-20120801/src/cmd/ksh93/edit/edit.c.kshmfix ksh-20120801/src/cmd/ksh93/edit/edit.c
Packit 992a25
--- ksh-20120801/src/cmd/ksh93/edit/edit.c.kshmfix      2013-09-23 10:46:57.007256192 +0200
Packit 992a25
+++ ksh-20120801/src/cmd/ksh93/edit/edit.c      2013-09-23 10:47:43.988937610 +0200
Packit 992a25
@@ -1050,7 +1050,7 @@ int ed_getchar(register Edit_t *ep,int m
Packit 992a25
 		{
Packit 992a25
 			if(mode<=0 && -c == ep->e_intr)
Packit 992a25
 			{
Packit 992a25
-				sh_fault(SIGINT);
Packit 992a25
+				killpg(getpgrp(),SIGINT);
Packit 992a25
 				siglongjmp(ep->e_env, UINTR);
Packit 992a25
 			}
Packit 992a25
 			if(mode<=0 && ep->sh->st.trap[SH_KEYTRAP])
Packit 992a25