|
 |
3f8f324 |
diff -up ksh-20120801/src/cmd/ksh93/include/defs.h.longer ksh-20120801/src/cmd/ksh93/include/defs.h
|
|
|
3f8f324 |
--- ksh-20120801/src/cmd/ksh93/include/defs.h.longer 2012-06-25 20:47:47.000000000 +0200
|
|
|
9922866 |
+++ ksh-20120801/src/cmd/ksh93/include/defs.h 2013-07-08 17:33:42.238534376 +0200
|
|
|
3f8f324 |
@@ -162,8 +162,8 @@ struct shared
|
|
|
3f8f324 |
Namval_t *prev_table; /* previous table used in nv_open */ \
|
|
|
3f8f324 |
Sfio_t *outpool; /* ouput stream pool */ \
|
|
|
3f8f324 |
long timeout; /* read timeout */ \
|
|
|
3f8f324 |
- short curenv; /* current subshell number */ \
|
|
|
3f8f324 |
- short jobenv; /* subshell number for jobs */ \
|
|
|
3f8f324 |
+ long curenv; /* current subshell number */ \
|
|
|
3f8f324 |
+ long jobenv; /* subshell number for jobs */ \
|
|
|
3f8f324 |
int infd; /* input file descriptor */ \
|
|
|
3f8f324 |
short nextprompt; /* next prompt is PS<nextprompt> */ \
|
|
|
3f8f324 |
short poolfiles; \
|
|
|
3f8f324 |
diff -up ksh-20120801/src/cmd/ksh93/include/jobs.h.longer ksh-20120801/src/cmd/ksh93/include/jobs.h
|
|
|
3f8f324 |
--- ksh-20120801/src/cmd/ksh93/include/jobs.h.longer 2011-12-19 13:36:37.000000000 +0100
|
|
|
9922866 |
+++ ksh-20120801/src/cmd/ksh93/include/jobs.h 2013-07-08 17:32:52.881124147 +0200
|
|
|
3f8f324 |
@@ -87,7 +87,7 @@ struct process
|
|
|
3f8f324 |
unsigned short p_exit; /* exit value or signal number */
|
|
|
3f8f324 |
unsigned short p_exitmin; /* minimum exit value for xargs */
|
|
|
3f8f324 |
unsigned short p_flag; /* flags - see below */
|
|
|
3f8f324 |
- int p_env; /* subshell environment number */
|
|
|
3f8f324 |
+ long p_env; /* subshell environment number */
|
|
|
3f8f324 |
#ifdef JOBS
|
|
|
3f8f324 |
off_t p_name; /* history file offset for command */
|
|
|
3f8f324 |
struct termios p_stty; /* terminal state for job */
|
|
|
9922866 |
diff -up ksh-20120801/src/cmd/ksh93/sh/jobs.c.longer ksh-20120801/src/cmd/ksh93/sh/jobs.c
|
|
|
3f8f324 |
diff -up ksh-20120801/src/cmd/ksh93/sh/subshell.c.longer ksh-20120801/src/cmd/ksh93/sh/subshell.c
|
|
|
9922866 |
--- ksh-20120801/src/cmd/ksh93/sh/subshell.c.longer 2013-07-08 17:32:52.874124090 +0200
|
|
|
9922866 |
+++ ksh-20120801/src/cmd/ksh93/sh/subshell.c 2013-07-08 17:32:52.882124156 +0200
|
|
|
3f8f324 |
@@ -98,7 +98,7 @@ static struct subshell
|
|
|
3f8f324 |
#endif /* SHOPT_COSHELL */
|
|
|
3f8f324 |
} *subshell_data;
|
|
|
3f8f324 |
|
|
|
3f8f324 |
-static int subenv;
|
|
|
3f8f324 |
+static long subenv;
|
|
|
3f8f324 |
|
|
|
3f8f324 |
|
|
|
3f8f324 |
/*
|
|
|
9922866 |
@@ -171,7 +171,8 @@ void sh_subfork(void)
|
|
|
3f8f324 |
{
|
|
|
3f8f324 |
register struct subshell *sp = subshell_data;
|
|
|
3f8f324 |
Shell_t *shp = sp->shp;
|
|
|
9922866 |
- int curenv = shp->curenv, comsub=shp->comsub;
|
|
|
9922866 |
+ long curenv = shp->curenv;
|
|
|
9922866 |
+ int comsub=shp->comsub;
|
|
|
3f8f324 |
pid_t pid;
|
|
|
3f8f324 |
char *trap = shp->st.trapcom[0];
|
|
|
3f8f324 |
if(trap)
|
|
|
9922866 |
@@ -461,7 +462,7 @@ Sfio_t *sh_subshell(Shell_t *shp,Shnode_
|
|
|
3f8f324 |
struct subshell sub_data;
|
|
|
3f8f324 |
register struct subshell *sp = &sub_data;
|
|
|
3f8f324 |
int jmpval,nsig=0,duped=0;
|
|
|
3f8f324 |
- int savecurenv = shp->curenv;
|
|
|
3f8f324 |
+ long savecurenv = shp->curenv;
|
|
|
3f8f324 |
int savejobpgid = job.curpgid;
|
|
|
3f8f324 |
int *saveexitval = job.exitval;
|
|
|
3f8f324 |
int16_t subshell;
|