Changeset 1207 in kBuild for trunk/src

Timestamp:

Oct 7, 2007 5:09:24 PM (17 years ago)

Author:

bird

Message:

jobs and other stuff.

Location:

trunk/src/kash

Files:

• Makefile.kmk (modified) (1 diff)
• bltin/kill.c (modified) (2 diffs)
• error.c (modified) (1 diff)
• eval.c (modified) (1 diff)
• exec.c (modified) (1 diff)
• expand.c (modified) (3 diffs)
• histedit.c (modified) (1 diff)
• jobs.c (modified) (78 diffs)
• main.c (modified) (1 diff)
• miscbltin.c (modified) (2 diffs)
• mystring.c (modified) (1 diff)
• mystring.h (modified) (1 diff)
• output.c (modified) (1 diff)
• redir.c (modified) (6 diffs)
• shfile.h (modified) (1 diff)
• shinstance.c (modified) (1 diff)
• shinstance.h (modified) (4 diffs)
• show.c (modified) (4 diffs)
• shtypes.h (modified) (2 diffs)
• trap.c (modified) (2 diffs)
• var.c (modified) (1 diff)
• win/mscfakes.h (modified) (2 diffs)

trunk/src/kash/Makefile.kmk

@@ -36 +36 @@
         error.c \
         eval.c \
+        exec.c \
+        expand.c \
         histedit.c \
+        input.c \
+        jobs.c \
         mail.c \
         memalloc.c \
         mystring.c \
         options.c \
+        output.c \
         show.c \
         syntax.c \
-        output.c \
-        input.c \
-        exec.c \
-        expand.c \
         miscbltin.c \
         bltin/echo.c \
         bltin/test.c \
         \
-        jobs.c \
         parser.c \
         redir.c \

trunk/src/kash/bltin/kill.c

@@ -68 +68 @@
 #define main killcmd
 #include "bltin/bltin.h"
+#include "jobs.h"
 #endif /* SHELL */
 
@@ -153 +154 @@
         for (errors = 0; argc; argc--, argv++) {
 #ifdef SHELL
-                extern int getjobpgrp(shinstance *psh, const char *);
                 if (*argv[0] == '%') {
                         pid = getjobpgrp(psh, *argv);

trunk/src/kash/error.c

@@ -164 +164 @@
                 TRACE((psh, "exverror(%d, \"", cond));
                 TRACEV((psh, msg, ap));
-                TRACE((psh, "\") pid=%d\n", getpid()));
+                TRACE((psh, "\") pid=%d\n", sh_getpid(psh)));
         } else
-                TRACE((psh, "exverror(%d, NULL) pid=%d\n", cond, getpid()));
+                TRACE((psh, "exverror(%d, NULL) pid=%d\n", cond, sh_getpid(psh)));
 #endif
         if (msg)

trunk/src/kash/eval.c

@@ -234 +234 @@
 #endif
         TRACE((psh, "pid %d, evaltree(%p: %d, %d) called\n",
-               getpid(), n, n->type, flags));
+               sh_getpid(psh), n, n->type, flags));
         switch (n->type) {
         case NSEMI:

trunk/src/kash/exec.c

@@ -676 +676 @@
                 /* XXX this code stops root executing stuff, and is buggy
                    if you need a group from the group list. */
-                if (statb.st_uid == geteuid()) {
+                if (statb.st_uid == sh_geteuid(psh)) {
                         if ((statb.st_mode & 0100) == 0)
                                 goto loop;
-                } else if (statb.st_gid == getegid()) {
+                } else if (statb.st_gid == sh_getegid(psh)) {
                         if ((statb.st_mode & 010) == 0)
                                 goto loop;

trunk/src/kash/expand.c

@@ -453 +453 @@
                         if (in.fd < 0)
                                 break;
-                        while ((i = read(in.fd, buf, sizeof buf)) < 0 && errno == EINTR);
+                        while ((i = shfile_read(&psh->fdtab, in.fd, buf, sizeof buf)) < 0 && errno == EINTR);
                         TRACE((psh, "expbackq: read returns %d\n", i));
                         if (i <= 0)
@@ -474 +474 @@
 
         if (in.fd >= 0)
-                close(in.fd);
+                shfile_close(&psh->fdtab, in.fd);
         if (in.buf)
                 ckfree(in.buf);
@@ -1192 +1192 @@
                                 break;
                 }
-                if (metaflag == 0 || lstat(psh->expdir, &statb) >= 0)
+                if (metaflag == 0 || shfile_lstat(&psh->fdtab, psh->expdir, &statb) >= 0)
                         addfname(psh, psh->expdir);
                 return;

trunk/src/kash/histedit.c

@@ -389 +389 @@
                         error(psh, "can't create temporary file %s", editfile);
                 if ((efp = fdopen(fd, "w")) == NULL) {
-                        close(fd);
+                        shfile_close(&psh->fdtab, fd);
                         error(psh, "can't allocate stdio buffer for temp");
                 }

trunk/src/kash/jobs.c

@@ -48 +48 @@
 #include <fcntl.h>
 #ifdef __sun__
-#define sys_siglist _sys_siglist
+# define sys_siglist _sys_siglist
 #endif
 #include <signal.h>
@@ -55 +55 @@
 #include <stdlib.h>
 #ifndef __sun__
-#include <paths.h>
+# include <paths.h>
 #endif
 #include <sys/types.h>
 #include <sys/param.h>
 #if defined(BSD) || defined(__sun__)
-#include <sys/wait.h>
-#include <sys/time.h>
-#include <sys/resource.h>
+# include <sys/wait.h>
+# include <sys/time.h>
+# include <sys/resource.h>
 #endif
 #include <sys/ioctl.h>
@@ -68 +68 @@
 #include "shell.h"
 #if JOBS
-#if OLD_TTY_DRIVER
-#include "sgtty.h"
-#else
-#include <termios.h>
-#endif
-#undef CEOF                     /* syntax.h redefines this */
+# include <termios.h>
+# undef CEOF                    /* syntax.h redefines this */
 #endif
 #include "redir.h"
@@ -89 +85 @@
 #include "error.h"
 #include "mystring.h"
-
-
-static struct job *jobtab;              /* array of jobs */
-static int njobs;                       /* size of array */
-static int jobs_invalid;                /* set in child */
-MKINIT pid_t psh->backgndpid = -1;      /* pid of last background process */
-#if JOBS
-int initialpgrp;                /* pgrp of shell on invocation */
-static int curjob = -1;         /* current job */
-#endif
-static int ttyfd = -1;
-
-STATIC void restartjob(struct job *);
-STATIC void freejob(struct job *);
-STATIC struct job *getjob(const char *, int);
-STATIC int dowait(int, struct job *);
-STATIC int onsigchild(void);
-STATIC int waitproc(int, struct job *, int *);
-STATIC void cmdtxt(union node *);
-STATIC void cmdlist(union node *, int);
-STATIC void cmdputs(const char *);
-
-#ifdef OLD_TTY_DRIVER
-static pid_t tcgetpgrp(int fd);
-static int tcsetpgrp(int fd, pid_t pgrp);
-
-static pid_t
-tcgetpgrp(shinstance *psh, int fd)
-{
-        pid_t pgrp;
-        if (shfile_ioctl(&psh->fdtab, fd, TIOCGPGRP, (char *)&pgrp) == -1)
-                return -1;
-        else
-                return pgrp;
-}
-
-static int
-tcsetpgrp(shinstance *psh, int fd, pid_tpgrp)
-{
-        return shfile_ioctl(&psh->fdtab, fd, TIOCSPGRP, (char *)&pgrp);
-}
-#endif
+#include "shinstance.h"
+
+//static struct job *jobtab;            /* array of jobs */
+//static int njobs;                     /* size of array */
+//static int jobs_invalid;              /* set in child */
+//MKINIT pid_t backgndpid = -1; /* pid of last background process */
+#if JOBS
+//int initialpgrp;              /* pgrp of shell on invocation */
+//static int curjob = -1;               /* current job */
+#endif
+//static int ttyfd = -1;
+
+STATIC void restartjob(shinstance *, struct job *);
+STATIC void freejob(shinstance *, struct job *);
+STATIC struct job *getjob(shinstance *, const char *, int);
+STATIC int dowait(shinstance *, int, struct job *);
+STATIC int waitproc(shinstance *, int, struct job *, int *);
+STATIC void cmdtxt(shinstance *, union node *);
+STATIC void cmdlist(shinstance *, union node *, int);
+STATIC void cmdputs(shinstance *, const char *);
+
 
 /*
@@ -140 +115 @@
  */
 
-MKINIT int jobctl;
+//MKINIT int jobctl;
 
 void
-setjobctl(int on)
-{
-#ifdef OLD_TTY_DRIVER
-        int ldisc;
-#endif
-
-        if (on == jobctl || rootshell == 0)
+setjobctl(shinstance *psh, int on)
+{
+        if (on == psh->jobctl || psh->rootshell == 0)
                 return;
         if (on) {
@@ -155 +126 @@
                 int err;
                 int i;
-                if (ttyfd != -1)
-                        close(ttyfd);
-                if ((ttyfd = open("/dev/tty", O_RDWR)) == -1) {
+                if (psh->ttyfd != -1)
+                        shfile_close(&psh->fdtab, psh->ttyfd);
+                if ((psh->ttyfd = shfile_open(&psh->fdtab, "/dev/tty", O_RDWR)) == -1) {
                         for (i = 0; i < 3; i++) {
-                                if (isatty(i) && (ttyfd = dup(i)) != -1)
+                                if (shfile_isatty(&psh->fdtab, i)
+                                 && (psh->ttyfd = shfile_dup(&psh->fdtab, i)) != -1)
                                         break;
                         }
@@ -167 +139 @@
                 /* Move to a high fd */
                 for (i = 10; i > 2; i--) {
-                        if ((err = fcntl(ttyfd, F_DUPFD, (1 << i) - 1)) != -1)
+                        if ((err = shfile_fcntl(&psh->fdtab, psh->ttyfd, F_DUPFD, (1 << i) - 1)) != -1)
                                 break;
                 }
                 if (err != -1) {
-                        close(ttyfd);
-                        ttyfd = err;
+                        shfile_close(&psh->fdtab, psh->ttyfd);
+                        psh->ttyfd = err;
                 }
 #ifdef FIOCLEX
-                err = ioctl(ttyfd, FIOCLEX, 0);
+                err = shfile_ioctl(&psh->fdtab, psh->ttyfd, FIOCLEX, 0);
 #elif FD_CLOEXEC
-                err = fcntl(ttyfd, F_SETFD,
-                    fcntl(ttyfd, F_GETFD, 0) | FD_CLOEXEC);
+                err = shfile_fcntl(&psh->fdtab, psh->ttyfd, F_SETFD,
+                    shfile_fcntl(&psh->fdtab, psh->ttyfd, F_GETFD, 0) | FD_CLOEXEC);
 #endif
                 if (err == -1) {
-                        close(ttyfd);
-                        ttyfd = -1;
+                        shfile_close(&psh->fdtab, psh->ttyfd);
+                        psh->ttyfd = -1;
                         goto out;
                 }
@@ -190 +162 @@
 #endif
                 do { /* while we are in the background */
-                        if ((initialpgrp = tcgetpgrp(ttyfd)) < 0) {
+                        if ((psh->initialpgrp = sh_tcgetpgrp(psh, psh->ttyfd)) < 0) {
 out:
                                 out2str(psh, "sh: can't access tty; job control turned off\n");
@@ -196 +168 @@
                                 return;
                         }
-                        if (initialpgrp == -1)
-                                initialpgrp = getpgrp();
-                        else if (initialpgrp != getpgrp()) {
-                                killpg(0, SIGTTIN);
+                        if (psh->initialpgrp == -1)
+                                psh->initialpgrp = sh_getpgrp(psh);
+                        else if (psh->initialpgrp != sh_getpgrp(psh)) {
+                                sh_killpg(psh, 0, SIGTTIN);
                                 continue;
                         }
                 } while (0);
 
-#ifdef OLD_TTY_DRIVER
-                if (ioctl(ttyfd, TIOCGETD, (char *)&ldisc) < 0
-                    || ldisc != NTTYDISC) {
-                        out2str(psh, "sh: need new tty driver to run job control; job control turned off\n");
-                        mflag(psh) = 0;
-                        return;
-                }
-#endif
                 setsignal(psh, SIGTSTP, 0);
                 setsignal(psh, SIGTTOU, 0);
                 setsignal(psh, SIGTTIN, 0);
-                if (getpgid(0) != psh->rootpid && sh_setpgid(0, psh->rootpid) == -1)
+                if (sh_getpgid(psh, 0) != psh->rootpid && sh_setpgid(psh, 0, psh->rootpid) == -1)
                         error(psh, "Cannot set process group (%s) at %d",
                             strerror(errno), __LINE__);
-                if (tcsetpgrp(ttyfd, psh->rootpid) == -1)
+                if (sh_tcsetpgrp(psh, psh->ttyfd, psh->rootpid) == -1)
                         error(psh, "Cannot set tty process group (%s) at %d",
                             strerror(errno), __LINE__);
         } else { /* turning job control off */
-                if (getpgid(0) != initialpgrp && sh_setpgid(0, initialpgrp) == -1)
+                if (sh_getpgid(psh, 0) != psh->initialpgrp && sh_setpgid(psh, 0, psh->initialpgrp) == -1)
                         error(psh, "Cannot set process group (%s) at %d",
                             strerror(errno), __LINE__);
-                if (tcsetpgrp(ttyfd, initialpgrp) == -1)
+                if (sh_tcsetpgrp(psh, psh->ttyfd, psh->initialpgrp) == -1)
                         error(psh, "Cannot set tty process group (%s) at %d",
                             strerror(errno), __LINE__);
-                close(ttyfd);
-                ttyfd = -1;
+                shfile_close(&psh->fdtab, psh->ttyfd);
+                psh->ttyfd = -1;
                 setsignal(psh, SIGTSTP, 0);
                 setsignal(psh, SIGTTOU, 0);
                 setsignal(psh, SIGTTIN, 0);
         }
-        jobctl = on;
+        psh->jobctl = on;
 }
 
@@ -261 +225 @@
 
         nextopt(psh, "");
-        jp = getjob(*psh->argptr, 0);
+        jp = getjob(psh, *psh->argptr, 0);
         if (jp->jobctl == 0)
                 error(psh, "job not created under job control");
@@ -271 +235 @@
 
         for (i = 0; i < jp->nprocs; i++)
-            if (tcsetpgrp(psh, ttyfd, jp->ps[i].pid) != -1)
+            if (sh_tcsetpgrp(psh, psh->ttyfd, jp->ps[i].pid) != -1)
                     break;
 
@@ -286 +250 @@
 
 static void
-set_curjob(struct job *jp, int mode)
+set_curjob(shinstance *psh, struct job *jp, int mode)
 {
         struct job *jp1, *jp2;
         int i, ji;
 
-        ji = jp - jobtab;
+        ji = (int)(jp - psh->jobtab);
 
         /* first remove from list */
-        if (ji == curjob)
-                curjob = jp->prev_job;
+        if (ji == psh->curjob)
+                psh->curjob = jp->prev_job;
         else {
-                for (i = 0; i < njobs; i++) {
-                        if (jobtab[i].prev_job != ji)
+                for (i = 0; i < psh->njobs; i++) {
+                        if (psh->jobtab[i].prev_job != ji)
                                 continue;
-                        jobtab[i].prev_job = jp->prev_job;
+                        psh->jobtab[i].prev_job = jp->prev_job;
                         break;
                 }
@@ -312 +276 @@
         case 1: /* newly created job or backgrounded job,
                    put after all stopped jobs. */
-                if (curjob != -1 && jobtab[curjob].state == JOBSTOPPED) {
-                        for (jp1 = jobtab + curjob; ; jp1 = jp2) {
+                if (psh->curjob != -1 && psh->jobtab[psh->curjob].state == JOBSTOPPED) {
+                        for (jp1 = psh->jobtab + psh->curjob; ; jp1 = jp2) {
                                 if (jp1->prev_job == -1)
                                         break;
-                                jp2 = jobtab + jp1->prev_job;
+                                jp2 = psh->jobtab + jp1->prev_job;
                                 if (jp2->state != JOBSTOPPED)
                                         break;
@@ -325 +289 @@
                 }
                 /* FALLTHROUGH */
-        case 2: /* newly stopped job - becomes curjob */
-                jp->prev_job = curjob;
-                curjob = ji;
+        case 2: /* newly stopped job - becomes psh->curjob */
+                jp->prev_job = psh->curjob;
+                psh->curjob = ji;
                 break;
         }
@@ -333 +297 @@
 
 int
-bgcmd(int argc, char **argv)
+bgcmd(shinstance *psh, int argc, char **argv)
 {
         struct job *jp;
@@ -343 +307 @@
                 if (jp->jobctl == 0)
                         error(psh, "job not created under job control");
-                set_curjob(jp, 1);
-                out1fmt(psh, "[%ld] %s", (long)(jp - jobtab + 1), jp->ps[0].cmd);
+                set_curjob(psh, jp, 1);
+                out1fmt(psh, "[%ld] %s", (long)(jp - psh->jobtab + 1), jp->ps[0].cmd);
                 for (i = 1; i < jp->nprocs; i++)
                         out1fmt(psh, " | %s", jp->ps[i].cmd );
                 out1c(psh, '\n');
                 output_flushall(psh);
-                restartjob(jp);
+                restartjob(psh, jp);
         } while (*psh->argptr && *++psh->argptr);
         return 0;
@@ -356 +320 @@
 
 STATIC void
-restartjob(struct job *jp)
+restartjob(shinstance *psh, struct job *jp)
 {
         struct procstat *ps;
@@ -365 +329 @@
         INTOFF;
         for (i = 0; i < jp->nprocs; i++)
-                if (killpg(jp->ps[i].pid, SIGCONT) != -1)
+                if (sh_killpg(psh, jp->ps[i].pid, SIGCONT) != -1)
                         break;
         if (i >= jp->nprocs)
@@ -380 +344 @@
 
 static void
-showjob(struct output *out, struct job *jp, int mode)
+showjob(shinstance *psh, struct output *out, struct job *jp, int mode)
 {
         int procno;
         int st;
         struct procstat *ps;
-        int col;
+        size_t col;
         char s[64];
 
@@ -425 +389 @@
         if (mode & SHOW_SIGNALLED && !(mode & SHOW_ISSIG)) {
                 if (jp->state == JOBDONE && !(mode & SHOW_NO_FREE)) {
-                        TRACE((psh, "showjob: freeing job %d\n", jp - jobtab + 1));
-                        freejob(jp);
+                        TRACE((psh, "showjob: freeing job %d\n", jp - psh->jobtab + 1));
+                        freejob(psh, jp);
                 }
                 return;
@@ -434 +398 @@
                 if (ps == jp->ps)
                         fmtstr(s, 16, "[%ld] %c ",
-                                (long)(jp - jobtab + 1),
-#if JOBS
-                                jp == jobtab + curjob ? '+' :
-                                curjob != -1 && jp == jobtab +
-                                            jobtab[curjob].prev_job ? '-' :
+                                (long)(jp - psh->jobtab + 1),
+#if JOBS
+                                jp == psh->jobtab + psh->curjob ? '+' :
+                                psh->curjob != -1 && jp == psh->jobtab +
+                                            psh->jobtab[psh->curjob].prev_job ? '-' :
 #endif
                                 ' ');
@@ -494 +458 @@
         jp->changed = 0;
         if (jp->state == JOBDONE && !(mode & SHOW_NO_FREE))
-                freejob(jp);
+                freejob(psh, jp);
 }
 
 
 int
-jobscmd(int argc, char **argv)
+jobscmd(shinstance *psh, int argc, char **argv)
 {
         int mode, m;
-        int sv = jobs_invalid;
-
-        jobs_invalid = 0;
+        int sv = psh->jobs_invalid;
+
+        psh->jobs_invalid = 0;
         mode = 0;
         while ((m = nextopt(psh, "lp")))
@@ -513 +477 @@
         if (*psh->argptr)
                 do
-                        showjob(out1, getjob(*psh->argptr,0), mode);
+                        showjob(psh, psh->out1, getjob(psh, *psh->argptr,0), mode);
                 while (*++psh->argptr);
         else
-                showjobs(psh, out1, mode);
-        jobs_invalid = sv;
+                showjobs(psh, psh->out1, mode);
+        psh->jobs_invalid = sv;
         return 0;
 }
@@ -532 +496 @@
 
 void
-showjobs(struct output *out, int mode)
+showjobs(shinstance *psh, struct output *out, int mode)
 {
         int jobno;
@@ -541 +505 @@
 
         /* If not even one one job changed, there is nothing to do */
-        gotpid = dowait(0, NULL);
-        while (dowait(0, NULL) > 0)
+        gotpid = dowait(psh, 0, NULL);
+        while (dowait(psh, 0, NULL) > 0)
                 continue;
 #ifdef JOBS
@@ -549 +513 @@
          * put us in it.
          */
-        if (mflag(psh) && gotpid != -1 && tcgetpgrp(ttyfd) != getpid()) {
-                if (tcsetpgrp(ttyfd, getpid()) == -1)
+        if (mflag(psh) && gotpid != -1 && sh_tcgetpgrp(psh, psh->ttyfd) != sh_getpid(psh)) {
+                if (sh_tcsetpgrp(psh, psh->ttyfd, sh_getpid(psh)) == -1)
                         error(psh, "Cannot set tty process group (%s) at %d",
                             strerror(errno), __LINE__);
@@ -557 +521 @@
         }
 #endif
-        if (jobs_invalid)
+        if (psh->jobs_invalid)
                 return;
 
-        for (jobno = 1, jp = jobtab ; jobno <= njobs ; jobno++, jp++) {
+        for (jobno = 1, jp = psh->jobtab ; jobno <= psh->njobs ; jobno++, jp++) {
                 if (!jp->used)
                         continue;
                 if (jp->nprocs == 0) {
-                        freejob(jp);
+                        freejob(psh, jp);
                         continue;
                 }
@@ -573 +537 @@
                         continue;
                 }
-                showjob(out, jp, mode);
+                showjob(psh, out, jp, mode);
         }
 }
@@ -582 +546 @@
 
 STATIC void
-freejob(struct job *jp)
+freejob(shinstance *psh, struct job *jp)
 {
         INTOFF;
@@ -592 +556 @@
         jp->used = 0;
 #if JOBS
-        set_curjob(jp, 0);
+        set_curjob(psh, jp, 0);
 #endif
         INTON;
@@ -600 +564 @@
 
 int
-waitcmd(int argc, char **argv)
+waitcmd(shinstance *psh, int argc, char **argv)
 {
         struct job *job;
@@ -610 +574 @@
         if (!*psh->argptr) {
                 /* wait for all jobs */
-                jp = jobtab;
-                if (jobs_invalid)
+                jp = psh->jobtab;
+                if (psh->jobs_invalid)
                         return 0;
                 for (;;) {
-                        if (jp >= jobtab + njobs) {
+                        if (jp >= psh->jobtab + psh->njobs) {
                                 /* no running procs */
                                 return 0;
@@ -622 +586 @@
                                 continue;
                         }
-                        if (dowait(1, (struct job *)NULL) == -1)
+                        if (dowait(psh, 1, (struct job *)NULL) == -1)
                                return 128 + SIGINT;
-                        jp = jobtab;
+                        jp = psh->jobtab;
                 }
         }
@@ -630 +594 @@
         retval = 127;           /* XXXGCC: -Wuninitialized */
         for (; *psh->argptr; psh->argptr++) {
-                job = getjob(*psh->argptr, 1);
+                job = getjob(psh, *psh->argptr, 1);
                 if (!job) {
                         retval = 127;
@@ -637 +601 @@
                 /* loop until process terminated or stopped */
                 while (job->state == JOBRUNNING) {
-                        if (dowait(1, (struct job *)NULL) == -1)
+                        if (dowait(psh, 1, (struct job *)NULL) == -1)
                                return 128 + SIGINT;
                 }
@@ -652 +616 @@
                 }
                 if (!iflag(psh))
-                        freejob(job);
+                        freejob(psh, job);
         }
         return retval;
@@ -660 +624 @@
 
 int
-jobidcmd(int argc, char **argv)
+jobidcmd(shinstance *psh, int argc, char **argv)
 {
         struct job *jp;
@@ -666 +630 @@
 
         nextopt(psh, "");
-        jp = getjob(*psh->argptr, 0);
+        jp = getjob(psh, *psh->argptr, 0);
         for (i = 0 ; i < jp->nprocs ; ) {
                 out1fmt(psh, "%ld", (long)jp->ps[i].pid);
@@ -675 +639 @@
 
 int
-getjobpgrp(const char *name)
+getjobpgrp(shinstance *psh, const char *name)
 {
         struct job *jp;
 
-        jp = getjob(name, 1);
+        jp = getjob(psh, name, 1);
         if (jp == 0)
                 return 0;
@@ -690 +654 @@
 
 STATIC struct job *
-getjob(const char *name, int noerror)
+getjob(shinstance *psh, const char *name, int noerror)
 {
         int jobno = -1;
@@ -700 +664 @@
         if (name == NULL) {
 #if JOBS
-                jobno = curjob;
+                jobno = psh->curjob;
 #endif
                 err_msg = "No current job";
@@ -712 +676 @@
                         case '+':
                         case '%':
-                                jobno = curjob;
+                                jobno = psh->curjob;
                                 err_msg = "No current job";
                                 break;
                         case '-':
-                                jobno = curjob;
+                                jobno = psh->curjob;
                                 if (jobno != -1)
-                                        jobno = jobtab[jobno].prev_job;
+                                        jobno = psh->jobtab[jobno].prev_job;
                                 err_msg = "No previous job";
                                 break;
@@ -729 +693 @@
     check_pattern:
                         found = NULL;
-                        for (jp = jobtab, i = njobs ; --i >= 0 ; jp++) {
+                        for (jp = psh->jobtab, i = psh->njobs ; --i >= 0 ; jp++) {
                                 if (!jp->used || jp->nprocs <= 0)
                                         continue;
@@ -749 +713 @@
         } else if (is_number(name)) {
                 pid = number(psh, name);
-                for (jp = jobtab, i = njobs ; --i >= 0 ; jp++) {
+                for (jp = psh->jobtab, i = psh->njobs ; --i >= 0 ; jp++) {
                         if (jp->used && jp->nprocs > 0
                          && jp->ps[jp->nprocs - 1].pid == pid)
@@ -756 +720 @@
         }
 
-        if (!jobs_invalid && jobno >= 0 && jobno < njobs) {
-                jp = jobtab + jobno;
+        if (!psh->jobs_invalid && jobno >= 0 && jobno < psh->njobs) {
+                jp = psh->jobtab + jobno;
                 if (jp->used)
                         return jp;
@@ -773 +737 @@
 
 struct job *
-makejob(union node *node, int nprocs)
+makejob(shinstance *psh, union node *node, int nprocs)
 {
         int i;
         struct job *jp;
 
-        if (jobs_invalid) {
-                for (i = njobs, jp = jobtab ; --i >= 0 ; jp++) {
+        if (psh->jobs_invalid) {
+                for (i = psh->njobs, jp = psh->jobtab ; --i >= 0 ; jp++) {
                         if (jp->used)
-                                freejob(jp);
-                }
-                jobs_invalid = 0;
-        }
-
-        for (i = njobs, jp = jobtab ; ; jp++) {
+                                freejob(psh, jp);
+                }
+                psh->jobs_invalid = 0;
+        }
+
+        for (i = psh->njobs, jp = psh->jobtab ; ; jp++) {
                 if (--i < 0) {
                         INTOFF;
-                        if (njobs == 0) {
-                                jobtab = ckmalloc(4 * sizeof jobtab[0]);
+                        if (psh->njobs == 0) {
+                                psh->jobtab = ckmalloc(4 * sizeof psh->jobtab[0]);
                         } else {
-                                jp = ckmalloc((njobs + 4) * sizeof jobtab[0]);
-                                memcpy(jp, jobtab, njobs * sizeof jp[0]);
+                                jp = ckmalloc((psh->njobs + 4) * sizeof psh->jobtab[0]);
+                                memcpy(jp, psh->jobtab, psh->njobs * sizeof jp[0]);
                                 /* Relocate `ps' pointers */
-                                for (i = 0; i < njobs; i++)
-                                        if (jp[i].ps == &jobtab[i].ps0)
+                                for (i = 0; i < psh->njobs; i++)
+                                        if (jp[i].ps == &psh->jobtab[i].ps0)
                                                 jp[i].ps = &jp[i].ps0;
-                                ckfree(jobtab);
-                                jobtab = jp;
+                                ckfree(psh->jobtab);
+                                psh->jobtab = jp;
                         }
-                        jp = jobtab + njobs;
-                        for (i = 4 ; --i >= 0 ; jobtab[njobs++].used = 0);
+                        jp = psh->jobtab + psh->njobs;
+                        for (i = 4 ; --i >= 0 ; psh->jobtab[psh->njobs++].used = 0);
                         INTON;
                         break;
@@ -815 +779 @@
         jp->nprocs = 0;
 #if JOBS
-        jp->jobctl = jobctl;
-        set_curjob(jp, 1);
+        jp->jobctl = psh->jobctl;
+        set_curjob(psh, jp, 1);
 #endif
         if (nprocs > 1) {
@@ -825 +789 @@
         INTON;
         TRACE((psh, "makejob(0x%lx, %d) returns %%%d\n", (long)node, nprocs,
-               jp - jobtab + 1));
+               jp - psh->jobtab + 1));
         return jp;
 }
@@ -846 +810 @@
 
 int
-forkshell(struct job *jp, union node *n, int mode)
+forkshell(shinstance *psh, struct job *jp, union node *n, int mode)
 {
         int pid;
 
-        TRACE((psh, "forkshell(%%%d, %p, %d) called\n", jp - jobtab, n, mode));
+        TRACE((psh, "forkshell(%%%d, %p, %d) called\n", jp - psh->jobtab, n, mode));
         switch ((pid = fork())) {
         case -1:
@@ -856 +820 @@
                 INTON;
                 error(psh, "Cannot fork");
-                break;
+                return -1; /* won't get here */
         case 0:
                 forkchild(psh, jp, n, mode, 0);
@@ -866 +830 @@
 
 int
-forkparent(struct job *jp, union node *n, int mode, pid_t pid)
+forkparent(shinstance *psh, struct job *jp, union node *n, int mode, pid_t pid)
 {
         int pgrp;
 
-        if (rootshell && mode != FORK_NOJOB && mflag(psh)) {
+        if (psh->rootshell && mode != FORK_NOJOB && mflag(psh)) {
                 if (jp == NULL || jp->nprocs == 0)
                         pgrp = pid;
@@ -876 +840 @@
                         pgrp = jp->ps[0].pid;
                 /* This can fail because we are doing it in the child also */
-                (void)setpgid(pid, pgrp);
+                (void)sh_setpgid(psh, pid, pgrp);
         }
         if (mode == FORK_BG)
-                psh0->backgndpid = pid;         /* set $! */
+                psh->backgndpid = pid;          /* set $! */
         if (jp) {
                 struct procstat *ps = &jp->ps[jp->nprocs++];
@@ -893 +857 @@
 
 void
-forkchild(struct job *jp, union node *n, int mode, int vforked)
+forkchild(shinstance *psh, struct job *jp, union node *n, int mode, int vforked)
 {
         int wasroot;
@@ -900 +864 @@
         const char *nullerr = "Can't open %s";
 
-        wasroot = rootshell;
-        TRACE((psh, "Child shell %d\n", getpid()));
+        wasroot = psh->rootshell;
+        TRACE((psh, "Child shell %d\n", sh_getpid(psh)));
         if (!vforked)
-                rootshell = 0;
+                psh->rootshell = 0;
 
         closescript(psh, vforked);
@@ -909 +873 @@
 #if JOBS
         if (!vforked)
-                jobctl = 0;             /* do job control only in root shell */
+                psh->jobctl = 0;                /* do job control only in root shell */
         if (wasroot && mode != FORK_NOJOB && mflag(psh)) {
                 if (jp == NULL || jp->nprocs == 0)
-                        pgrp = getpid();
+                        pgrp = sh_getpid(psh);
                 else
                         pgrp = jp->ps[0].pid;
                 /* This can fail because we are doing it in the parent also */
-                (void)setpgid(0, pgrp);
+                (void)sh_setpgid(psh, 0, pgrp);
                 if (mode == FORK_FG) {
-                        if (tcsetpgrp(ttyfd, pgrp) == -1)
+                        if (sh_tcsetpgrp(psh, psh->ttyfd, pgrp) == -1)
                                 error(psh, "Cannot set tty process group (%s) at %d",
                                     strerror(errno), __LINE__);
@@ -929 +893 @@
                 if ((jp == NULL || jp->nprocs == 0) &&
                     ! fd0_redirected_p(psh)) {
-                        close(0);
+                        shfile_close(&psh->fdtab, 0);
                         if (open(devnull, O_RDONLY) != 0)
                                 error(psh, nullerr, devnull);
@@ -940 +904 @@
                 if ((jp == NULL || jp->nprocs == 0) &&
                     ! fd0_redirected_p(psh)) {
-                        close(0);
+                        shfile_close(&psh->fdtab, 0);
                         if (open(devnull, O_RDONLY) != 0)
                                 error(psh, nullerr, devnull);
@@ -953 +917 @@
 
         if (!vforked)
-                jobs_invalid = 1;
+                psh->jobs_invalid = 1;
 }
 
@@ -976 +940 @@
 
 int
-waitforjob(struct job *jp)
-{
-#if JOBS
-        int mypgrp = getpgrp();
+waitforjob(shinstance *psh, struct job *jp)
+{
+#if JOBS
+        int mypgrp = sh_getpgrp(psh);
 #endif
         int status;
@@ -985 +949 @@
 
         INTOFF;
-        TRACE((psh, "waitforjob(%%%d) called\n", jp - jobtab + 1));
+        TRACE((psh, "waitforjob(%%%d) called\n", jp - psh->jobtab + 1));
         while (jp->state == JOBRUNNING) {
-                dowait(1, jp);
+                dowait(psh, 1, jp);
         }
 #if JOBS
         if (jp->jobctl) {
-                if (tcsetpgrp(ttyfd, mypgrp) == -1)
+                if (sh_tcsetpgrp(psh, psh->ttyfd, mypgrp) == -1)
                         error(psh, "Cannot set tty process group (%s) at %d",
                             strerror(errno), __LINE__);
         }
-        if (jp->state == JOBSTOPPED && curjob != jp - jobtab)
-                set_curjob(jp, 2);
+        if (jp->state == JOBSTOPPED && psh->curjob != jp - psh->jobtab)
+                set_curjob(psh, jp, 2);
 #endif
         status = jp->ps[jp->nprocs - 1].status;
@@ -1009 +973 @@
                 st = WTERMSIG(status) + 128;
         TRACE((psh, "waitforjob: job %d, nproc %d, status %x, st %x\n",
-                jp - jobtab + 1, jp->nprocs, status, st ));
+                jp - psh->jobtab + 1, jp->nprocs, status, st ));
 #if JOBS
         if (jp->jobctl) {
@@ -1025 +989 @@
 #endif
         if (! JOBS || jp->state == JOBDONE)
-                freejob(jp);
+                freejob(psh, jp);
         INTON;
         return st;
@@ -1037 +1001 @@
 
 STATIC int
-dowait(int block, struct job *job)
+dowait(shinstance *psh, int block, struct job *job)
 {
         int pid;
@@ -1046 +1010 @@
         int done;
         int stopped;
-        extern volatile char gotsig[];
 
         TRACE((psh, "dowait(%d) called\n", block));
         do {
-                pid = waitproc(block, job, &status);
+                pid = waitproc(psh, block, job, &status);
                 TRACE((psh, "wait returns pid %d, status %d\n", pid, status));
-        } while (pid == -1 && errno == EINTR && gotsig[SIGINT - 1] == 0);
+        } while (pid == -1 && errno == EINTR && psh->gotsig[SIGINT - 1] == 0);
         if (pid <= 0)
                 return pid;
         INTOFF;
         thisjob = NULL;
-        for (jp = jobtab ; jp < jobtab + njobs ; jp++) {
+        for (jp = psh->jobtab ; jp < psh->jobtab + psh->njobs ; jp++) {
                 if (jp->used) {
                         done = 1;
@@ -1065 +1028 @@
                                         continue;
                                 if (sp->pid == pid) {
-                                        TRACE((psh, "Job %d: changing status of proc %d from 0x%x to 0x%x\n", jp - jobtab + 1, pid, sp->status, status));
+                                        TRACE((psh, "Job %d: changing status of proc %d from 0x%x to 0x%x\n", jp - psh->jobtab + 1, pid, sp->status, status));
                                         sp->status = status;
                                         thisjob = jp;
@@ -1077 +1040 @@
                                 int state = done ? JOBDONE : JOBSTOPPED;
                                 if (jp->state != state) {
-                                        TRACE((psh, "Job %d: changing state from %d to %d\n", jp - jobtab + 1, jp->state, state));
+                                        TRACE((psh, "Job %d: changing state from %d to %d\n", jp - psh->jobtab + 1, jp->state, state));
                                         jp->state = state;
 #if JOBS
                                         if (done)
-                                                set_curjob(jp, 0);
+                                                set_curjob(psh, jp, 0);
 #endif
                                 }
@@ -1090 +1053 @@
         if (thisjob && thisjob->state != JOBRUNNING) {
                 int mode = 0;
-                if (!rootshell || !iflag(psh))
+                if (!psh->rootshell || !iflag(psh))
                         mode = SHOW_SIGNALLED;
                 if (job == thisjob)
                         mode = SHOW_SIGNALLED | SHOW_NO_FREE;
                 if (mode)
-                        showjob(psh->out2, thisjob, mode);
+                        showjob(psh, psh->out2, thisjob, mode);
                 else {
                         TRACE((psh, "Not printing status, rootshell=%d, job=%p\n",
-                                rootshell, job));
+                                psh->rootshell, job));
                         thisjob->changed = 1;
                 }
@@ -1113 +1076 @@
  * stopped processes.  If block is zero, we return a value of zero
  * rather than blocking.
- *
- * System V doesn't have a non-blocking wait system call.  It does
- * have a SIGCLD signal that is sent to a process when one of it's
- * children dies.  The obvious way to use SIGCLD would be to install
- * a handler for SIGCLD which simply bumped a counter when a SIGCLD
- * was received, and have waitproc bump another counter when it got
- * the status of a process.  Waitproc would then know that a wait
- * system call would not block if the two counters were different.
- * This approach doesn't work because if a process has children that
- * have not been waited for, System V will send it a SIGCLD when it
- * installs a signal handler for SIGCLD.  What this means is that when
- * a child exits, the shell will be sent SIGCLD signals continuously
- * until is runs out of stack space, unless it does a wait call before
- * restoring the signal handler.  The code below takes advantage of
- * this (mis)feature by installing a signal handler for SIGCLD and
- * then checking to see whether it was called.  If there are any
- * children to be waited for, it will be.
- *
- * If neither SYSV nor BSD is defined, we don't implement nonblocking
- * waits at all.  In this case, the user will not be informed when
- * a background process until the next time she runs a real program
- * (as opposed to running a builtin command or just typing return),
- * and the jobs command may give out of date information.
  */
-
-#ifdef SYSV
-STATIC int gotsigchild;
-
-STATIC int onsigchild() {
-        gotsigchild = 1;
-}
-#endif
-
-
 STATIC int
-waitproc(int block, struct job *jp, int *status)
-{
-#ifdef BSD
+waitproc(shinstance *psh, int block, struct job *jp, int *status)
+{
         int flags = 0;
 
@@ -1159 +1088 @@
         if (block == 0)
                 flags |= WNOHANG;
-        return wait3(status, flags, (struct rusage *)NULL);
-#else
-#ifdef SYSV
-        int (*save)();
-
-        if (block == 0) {
-                gotsigchild = 0;
-                save = signal(SIGCLD, onsigchild);
-                signal(SIGCLD, save);
-                if (gotsigchild == 0)
-                        return 0;
-        }
-        return wait(status);
-#else
-        if (block == 0)
-                return 0;
-        return wait(status);
-#endif
-#endif
+        return sh_waitpid(psh, -1, status, flags);
 }
 
@@ -1183 +1094 @@
  * return 1 if there are stopped jobs, otherwise 0
  */
-int job_warning = 0;
+//int job_warning = 0;
 int
-stoppedjobs(void)
+stoppedjobs(shinstance *psh)
 {
         int jobno;
         struct job *jp;
 
-        if (job_warning || jobs_invalid)
+        if (psh->job_warning || psh->jobs_invalid)
                 return (0);
-        for (jobno = 1, jp = jobtab; jobno <= njobs; jobno++, jp++) {
+        for (jobno = 1, jp = psh->jobtab; jobno <= psh->njobs; jobno++, jp++) {
                 if (jp->used == 0)
                         continue;
                 if (jp->state == JOBSTOPPED) {
                         out2str(psh, "You have stopped jobs.\n");
-                        job_warning = 2;
+                        psh->job_warning = 2;
                         return (1);
                 }
@@ -1210 +1121 @@
  */
 
-STATIC char *cmdnextc;
-STATIC int cmdnleft;
+//STATIC char *cmdnextc;
+//STATIC int cmdnleft;
 
 void
-commandtext(struct procstat *ps, union node *n)
+commandtext(shinstance *psh, struct procstat *ps, union node *n)
 {
         int len;
 
-        cmdnextc = ps->cmd;
-        if (iflag(psh) || mflag(psh) || sizeof ps->cmd < 100)
+        psh->cmdnextc = ps->cmd;
+        if (iflag(psh) || mflag(psh) || sizeof(ps->cmd) < 100)
                 len = sizeof(ps->cmd);
         else
                 len = sizeof(ps->cmd) / 10;
-        cmdnleft = len;
-        cmdtxt(n);
-        if (cmdnleft <= 0) {
+        psh->cmdnleft = len;
+        cmdtxt(psh, n);
+        if (psh->cmdnleft <= 0) {
                 char *p = ps->cmd + len - 4;
                 p[0] = '.';
@@ -1232 +1143 @@
                 p[3] = 0;
         } else
-                *cmdnextc = '\0';
+                *psh->cmdnextc = '\0';
         TRACE((psh, "commandtext: ps->cmd %x, end %x, left %d\n\t\"%s\"\n",
-                ps->cmd, cmdnextc, cmdnleft, ps->cmd));
+                ps->cmd, psh->cmdnextc, psh->cmdnleft, ps->cmd));
 }
 
 
 STATIC void
-cmdtxt(union node *n)
+cmdtxt(shinstance *psh, union node *n)
 {
         union node *np;
@@ -1247 +1158 @@
         char s[2];
 
-        if (n == NULL || cmdnleft <= 0)
+        if (n == NULL || psh->cmdnleft <= 0)
                 return;
         switch (n->type) {
         case NSEMI:
-                cmdtxt(n->nbinary.ch1);
-                cmdputs("; ");
-                cmdtxt(n->nbinary.ch2);
+                cmdtxt(psh, n->nbinary.ch1);
+                cmdputs(psh, "; ");
+                cmdtxt(psh, n->nbinary.ch2);
                 break;
         case NAND:
-                cmdtxt(n->nbinary.ch1);
-                cmdputs(" && ");
-                cmdtxt(n->nbinary.ch2);
+                cmdtxt(psh, n->nbinary.ch1);
+                cmdputs(psh, " && ");
+                cmdtxt(psh, n->nbinary.ch2);
                 break;
         case NOR:
-                cmdtxt(n->nbinary.ch1);
-                cmdputs(" || ");
-                cmdtxt(n->nbinary.ch2);
+                cmdtxt(psh, n->nbinary.ch1);
+                cmdputs(psh, " || ");
+                cmdtxt(psh, n->nbinary.ch2);
                 break;
         case NPIPE:
                 for (lp = n->npipe.cmdlist ; lp ; lp = lp->next) {
-                        cmdtxt(lp->n);
+                        cmdtxt(psh, lp->n);
                         if (lp->next)
-                                cmdputs(" | ");
+                                cmdputs(psh, " | ");
                 }
                 break;
         case NSUBSHELL:
-                cmdputs("(");
-                cmdtxt(n->nredir.n);
-                cmdputs(")");
+                cmdputs(psh, "(");
+                cmdtxt(psh, n->nredir.n);
+                cmdputs(psh, ")");
                 break;
         case NREDIR:
         case NBACKGND:
-                cmdtxt(n->nredir.n);
+                cmdtxt(psh, n->nredir.n);
                 break;
         case NIF:
-                cmdputs("if ");
-                cmdtxt(n->nif.test);
-                cmdputs("; then ");
-                cmdtxt(n->nif.ifpart);
+                cmdputs(psh, "if ");
+                cmdtxt(psh, n->nif.test);
+                cmdputs(psh, "; then ");
+                cmdtxt(psh, n->nif.ifpart);
                 if (n->nif.elsepart) {
-                        cmdputs("; else ");
-                        cmdtxt(n->nif.elsepart);
-                }
-                cmdputs("; fi");
+                        cmdputs(psh, "; else ");
+                        cmdtxt(psh, n->nif.elsepart);
+                }
+                cmdputs(psh, "; fi");
                 break;
         case NWHILE:
-                cmdputs("while ");
+                cmdputs(psh, "while ");
                 goto until;
         case NUNTIL:
-                cmdputs("until ");
+                cmdputs(psh, "until ");
 until:
-                cmdtxt(n->nbinary.ch1);
-                cmdputs("; do ");
-                cmdtxt(n->nbinary.ch2);
-                cmdputs("; done");
+                cmdtxt(psh, n->nbinary.ch1);
+                cmdputs(psh, "; do ");
+                cmdtxt(psh, n->nbinary.ch2);
+                cmdputs(psh, "; done");
                 break;
         case NFOR:
-                cmdputs("for ");
-                cmdputs(n->nfor.var);
-                cmdputs(" in ");
-                cmdlist(n->nfor.args, 1);
-                cmdputs("; do ");
-                cmdtxt(n->nfor.body);
-                cmdputs("; done");
+                cmdputs(psh, "for ");
+                cmdputs(psh, n->nfor.var);
+                cmdputs(psh, " in ");
+                cmdlist(psh, n->nfor.args, 1);
+                cmdputs(psh, "; do ");
+                cmdtxt(psh, n->nfor.body);
+                cmdputs(psh, "; done");
                 break;
         case NCASE:
-                cmdputs("case ");
-                cmdputs(n->ncase.expr->narg.text);
-                cmdputs(" in ");
+                cmdputs(psh, "case ");
+                cmdputs(psh, n->ncase.expr->narg.text);
+                cmdputs(psh, " in ");
                 for (np = n->ncase.cases; np; np = np->nclist.next) {
-                        cmdtxt(np->nclist.pattern);
-                        cmdputs(") ");
-                        cmdtxt(np->nclist.body);
-                        cmdputs(";; ");
-                }
-                cmdputs("esac");
+                        cmdtxt(psh, np->nclist.pattern);
+                        cmdputs(psh, ") ");
+                        cmdtxt(psh, np->nclist.body);
+                        cmdputs(psh, ";; ");
+                }
+                cmdputs(psh, "esac");
                 break;
         case NDEFUN:
-                cmdputs(n->narg.text);
-                cmdputs("() { ... }");
+                cmdputs(psh, n->narg.text);
+                cmdputs(psh, "() { ... }");
                 break;
         case NCMD:
-                cmdlist(n->ncmd.args, 1);
-                cmdlist(n->ncmd.redirect, 0);
+                cmdlist(psh, n->ncmd.args, 1);
+                cmdlist(psh, n->ncmd.redirect, 0);
                 break;
         case NARG:
-                cmdputs(n->narg.text);
+                cmdputs(psh, n->narg.text);
                 break;
         case NTO:
@@ -1353 +1264 @@
                         s[0] = n->nfile.fd + '0';
                         s[1] = '\0';
-                        cmdputs(s);
-                }
-                cmdputs(p);
+                        cmdputs(psh, s);
+                }
+                cmdputs(psh, p);
                 if (n->type == NTOFD || n->type == NFROMFD) {
                         s[0] = n->ndup.dupfd + '0';
                         s[1] = '\0';
-                        cmdputs(s);
+                        cmdputs(psh, s);
                 } else {
-                        cmdtxt(n->nfile.fname);
+                        cmdtxt(psh, n->nfile.fname);
                 }
                 break;
         case NHERE:
         case NXHERE:
-                cmdputs("<<...");
+                cmdputs(psh, "<<...");
                 break;
         default:
-                cmdputs("???");
+                cmdputs(psh, "???");
                 break;
         }
@@ -1375 +1286 @@
 
 STATIC void
-cmdlist(union node *np, int sep)
+cmdlist(shinstance *psh, union node *np, int sep)
 {
         for (; np; np = np->narg.next) {
                 if (!sep)
-                        cmdputs(" ");
-                cmdtxt(np);
+                        cmdputs(psh, " ");
+                cmdtxt(psh, np);
                 if (sep && np->narg.next)
-                        cmdputs(" ");
+                        cmdputs(psh, " ");
         }
 }
@@ -1388 +1299 @@
 
 STATIC void
-cmdputs(const char *s)
+cmdputs(shinstance *psh, const char *s)
 {
         const char *p, *str = 0;
@@ -1400 +1311 @@
 
         p = s;
-        nextc = cmdnextc;
-        nleft = cmdnleft;
+        nextc = psh->cmdnextc;
+        nleft = psh->cmdnleft;
         while (nleft > 0 && (c = *p++) != 0) {
                 switch (c) {
@@ -1480 +1391 @@
                 nleft--;
         }
-        cmdnleft = nleft;
-        cmdnextc = nextc;
-}
+        psh->cmdnleft = nleft;
+        psh->cmdnextc = nextc;
+}

trunk/src/kash/main.c

@@ -222 +222 @@
 state2:
         state = 3;
-        if (getuid() == geteuid() && getgid() == getegid()) {
+        if (sh_getuid(psh) == sh_geteuid(psh) && sh_getgid(psh) == sh_getegid(psh)) {
                 if ((shinit = lookupvar(psh, "ENV")) != NULL && *shinit != '\0') {
                         state = 3;

trunk/src/kash/miscbltin.c

@@ -129 +129 @@
         STARTSTACKSTR(psh, p);
         for (;;) {
-                if (read(0, &c, 1) != 1) {
+                if (shfile_read(&psh->fdtab, 0, &c, 1) != 1) {
                         status = 1;
                         break;
@@ -136 +136 @@
                         continue;
                 if (c == '\\' && !rflag) {
-                        if (read(0, &c, 1) != 1) {
+                        if (shfile_read(&psh->fdtab, 0, &c, 1) != 1) {
                                 status = 1;
                                 break;

trunk/src/kash/mystring.c

@@ -79 +79 @@
 
 void
-scopyn(const char *from, char *to, int size)
+scopyn(const char *from, char *to, ssize_t size)
 {
 

trunk/src/kash/mystring.h

@@ -38 +38 @@
 #include "shinstance.h"
 
-void scopyn(const char *, char *, int);
+void scopyn(const char *, char *, ssize_t);
 int prefix(const char *, const char *);
 int number(shinstance *, const char *);

trunk/src/kash/output.c

@@ -308 +308 @@
 #else
         long l;
-        u_long num;
+        unsigned long num;
 #endif
         unsigned base;

trunk/src/kash/redir.c

@@ -138 +138 @@
                         INTOFF;
 again:
-                        if ((i = fcntl(fd, F_DUPFD, 10)) == -1) {
+                        if ((i = shfile_fcntl(&psh->fdtab, fd, F_DUPFD, 10)) == -1) {
                                 switch (errno) {
                                 case EBADF:
@@ -155 +155 @@
                         if (!try) {
                                 sv->renamed[fd] = i;
-                                close(fd);
+                                shfile_close(&psh->fdtab, fd);
                         }
                         INTON;
                 } else {
-                        close(fd);
+                        shfile_close(&psh->fdtab, fd);
                 }
                 if (fd == 0)
@@ -198 +198 @@
                         goto eopen;
                 if (eflags)
-                        (void)fcntl(f, F_SETFL, fcntl(f, F_GETFL, 0) & ~eflags);
+                        (void)shfile_fcntl(&psh->fdtab, f, F_SETFL, shfile_fcntl(&psh->fdtab, f, F_GETFL, 0) & ~eflags);
                 break;
         case NFROMTO:
@@ -272 +272 @@
         }
         if (forkshell(psh, (struct job *)NULL, (union node *)NULL, FORK_NOJOB) == 0) {
-                close(pip[0]);
+                shfile_close(&psh->fdtab, pip[0]);
                 signal(SIGINT, SIG_IGN);
                 signal(SIGQUIT, SIG_IGN);
@@ -287 +287 @@
         }
 out:
-        close(pip[1]);
+        shfile_close(&psh->fdtab, pip[1]);
         return pip[0];
 }
@@ -359 +359 @@
                 for (i = 0 ; i < 10 ; i++) {
                         if (rp->renamed[i] >= 0) {
-                                close(rp->renamed[i]);
+                                shfile_close(&psh->fdtab, rp->renamed[i]);
                         }
                         if (!vforked)

trunk/src/kash/shfile.h

@@ -107 +107 @@
 long shfile_lseek(shfdtab *, int, long, int);
 int shfile_fcntl(shfdtab *, int fd, int cmd, int arg);
+int shfile_dup(shfdtab *, int fd);
 
 int shfile_stat(shfdtab *, const char *, struct stat *);

trunk/src/kash/shinstance.c

@@ -66 +66 @@
         psh->out2 = &psh->errout;
 
+        /* jobs.c */
+        psh->backgndpid = -1;
+#if JOBS
+        psh->curjob = -1;
+#endif
+        psh->ttyfd = -1;
+
     }
     return psh;

trunk/src/kash/shinstance.h

@@ -29 +29 @@
 
 #include <stdio.h> /* BUFSIZ */
+#include <signal.h> /* NSIG */
 
 #include "shtypes.h"
@@ -191 +192 @@
 
     /* jobs.h */
-    pid_t               backgndpid;     /**< pid of last background process */
+    pid_t               backgndpid/* = -1 */;   /**< pid of last background process */
     int                 job_warning;    /**< user was warned about stopped jobs */
+
+    /* jobs.c */
+    struct job         *jobtab;         /**< array of jobs */
+    int                 njobs;          /**< size of array */
+    int                 jobs_invalid;   /**< set in child */
+#if JOBS
+    int                 initialpgrp;    /**< pgrp of shell on invocation */
+    int                 curjob/* = -1*/;/**< current job */
+#endif
+    int                 ttyfd/* = -1*/;
+    int                 jobctl;         /**< job control enabled / disabled */
+    char               *cmdnextc;
+    int                 cmdnleft;
 
     /* input.h */
@@ -262 +276 @@
     char              **t_wp;
     struct t_op const  *t_wp_op;
+
+    /* trap.c */
+    char                gotsig[NSIG];   /**< indicates specified signal received */
 
 } shinstance;
@@ -331 +348 @@
 gid_t sh_getgid(shinstance *);
 gid_t sh_getegid(shinstance *);
-
-#endif
+pid_t sh_getpid(shinstance *);
+pid_t sh_getpgrp(shinstance *);
+pid_t sh_getpgid(shinstance *, pid_t);
+int sh_setpgid(shinstance *, pid_t, pid_t);
+int sh_killpg(shinstance *, pid_t, int);
+
+/* tc* */
+pid_t sh_tcgetpgrp(shinstance *, int);
+int sh_tcsetpgrp(shinstance *, int, pid_t);
+
+#endif

trunk/src/kash/show.c

@@ -290 +290 @@
         if (debug(psh) != 1)
                 return;
-        fprintf(tracefile, "[%d] ", getpid());
+        fprintf(tracefile, "[%d] ", sh_getpid(psh));
         va_start(va, fmt);
         (void) vfprintf(tracefile, fmt, va);
@@ -303 +303 @@
         if (debug(psh) != 1)
                 return;
-        fprintf(tracefile, "[%d] ", getpid());
+        fprintf(tracefile, "[%d] ", sh_getpid(psh));
         (void) vfprintf(tracefile, fmt, va);
 #endif
@@ -396 +396 @@
                 char *p;
                 if ((p = getenv("HOME")) == NULL) {
-                        if (geteuid() == 0)
+                        if (sh_geteuid(psh) == 0)
                                 p = "/";
                         else
@@ -421 +421 @@
         }
 #if defined(O_APPEND) && !defined(_MSC_VER)
-        if ((flags = fcntl(fileno(tracefile), F_GETFL, 0)) >= 0)
-                fcntl(fileno(tracefile), F_SETFL, flags | O_APPEND);
+        if ((flags = shfile_fcntl(&psh->fdtab, fileno(tracefile), F_GETFL, 0)) >= 0)
+                shfile_fcntl(&psh->fdtab, fileno(tracefile), F_SETFL, flags | O_APPEND);
 #endif
         setvbuf(tracefile, (char *)NULL, _IOLBF, 0); //setlinebuf(tracefile);

trunk/src/kash/shtypes.h

@@ -32 +32 @@
 
 #ifdef _MSC_VER
-#include <io.h> /* intptr_t and uintptr_t */
+# define setmode setmode_msc
+# include <io.h> /* intptr_t and uintptr_t */
+# undef setmode
 typedef signed char     int8_t;
 typedef unsigned char   uint8_t;
@@ -72 +74 @@
 typedef unsigned short  uid_t;
 typedef unsigned short  gid_t;
+typedef int             mode_t;
+typedef intptr_t        ssize_t;
 
 #else

trunk/src/kash/trap.c

@@ -261 +261 @@
         else
                 action = S_IGN;
-        if (rootshell && !vforked && action == S_DFL) {
+        if (psh->rootshell && !vforked && action == S_DFL) {
                 switch (signo) {
                 case SIGINT:
@@ -447 +447 @@
         char *p;
 
-        TRACE((psh, "pid %d, exitshell(%d)\n", getpid(), status));
+        TRACE((psh, "pid %d, exitshell(%d)\n", sh_getpid(psh), status));
         if (setjmp(loc1.loc)) {
                 goto l1;

trunk/src/kash/var.c

@@ -272 +272 @@
                 vps1.next = *vpp;
                 *vpp = &vps1;
-                vps1.text = strdup(geteuid() ? "PS1=$ " : "PS1=# ");
+                vps1.text = strdup(sh_geteuid(psh) ? "PS1=$ " : "PS1=# ");
                 vps1.flags = VSTRFIXED|VTEXTFIXED;
         }

trunk/src/kash/win/mscfakes.h

@@ -27 +27 @@
 #ifdef _MSC_VER
 
+#include "shtypes.h"
 #define setmode setmode_msc
 #include <sys/cdefs.h>
@@ -84 +85 @@
 
 #define MAX(a,b) ((a) >= (b) ? (a) : (b))
-
-typedef int mode_t;
-typedef unsigned short nlink_t;
-typedef long ssize_t;
-typedef unsigned long u_long;
-typedef unsigned int u_int;
-typedef unsigned short u_short;
 
 #ifndef timerisset