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