Changeset 1203 in kBuild for trunk/src/kash

Timestamp:

Oct 7, 2007 1:39:01 AM (17 years ago)

Author:

bird

Message:

converted a few more files.

Location:

trunk/src/kash

Files:

• Makefile.kmk (modified) (1 diff)
• bltin/bltin.h (modified) (1 diff)
• eval.c (modified) (1 diff)
• exec.c (modified) (63 diffs)
• exec.h (modified) (2 diffs)
• expand.c (modified) (66 diffs)
• expand.h (modified) (2 diffs)
• generated/init.c (modified) (4 diffs)
• histedit.c (modified) (1 diff)
• jobs.c (modified) (8 diffs)
• miscbltin.c (modified) (3 diffs)
• shinstance.h (modified) (7 diffs)
• trap.c (modified) (1 diff)
• var.c (modified) (3 diffs)

trunk/src/kash/Makefile.kmk

@@ -45 +45 @@
         output.c \
         input.c \
-        \
         exec.c \
         expand.c \
+        \
         jobs.c \
         miscbltin.c \

trunk/src/kash/bltin/bltin.h

@@ -72 +72 @@
 #define exit sh_exit
 #define setprogname(s)
-#define getprogname() commandname
+#define getprogname() psh->commandname
 #define setlocate(l,s) 0
 

trunk/src/kash/eval.c

@@ -881 +881 @@
                                                 sh__exit(psh, 0);
                                         } else {
-                                                sh__exit(psh, exerrno);
+                                                sh__exit(psh, psh->exerrno);
                                         }
                                 }

trunk/src/kash/exec.c

@@ -86 +86 @@
 #endif
 
-
-#define CMDTABLESIZE 31         /* should be prime */
-#define ARB 1                   /* actual size determined at run time */
-
-
-
-struct tblentry {
-        struct tblentry *next;  /* next entry in hash chain */
-        union param param;      /* definition of builtin function */
-        short cmdtype;          /* index identifying command */
-        char rehash;            /* if set, cd done since entry created */
-        char cmdname[ARB];      /* name of command */
-};
-
-
-STATIC struct tblentry *cmdtable[CMDTABLESIZE];
-STATIC int builtinloc = -1;             /* index in path of %builtin, or -1 */
-int exerrno = 0;                        /* Last exec error */
-
-
-STATIC void tryexec(char *, char **, char **, int, int);
-STATIC void execinterp(char **, char **);
-STATIC void printentry(struct tblentry *, int);
-STATIC void clearcmdentry(int);
-STATIC struct tblentry *cmdlookup(const char *, int);
-STATIC void delete_cmd_entry(void);
+#include "shinstance.h"
+
+//#define CMDTABLESIZE 31               /* should be prime */
+//#define ARB 1                 /* actual size determined at run time */
+//
+//
+//
+//struct tblentry {
+//      struct tblentry *next;  /* next entry in hash chain */
+//      union param param;      /* definition of builtin function */
+//      short cmdtype;          /* index identifying command */
+//      char rehash;            /* if set, cd done since entry created */
+//      char cmdname[ARB];      /* name of command */
+//};
+//
+//
+//STATIC struct tblentry *cmdtable[CMDTABLESIZE];
+//STATIC int builtinloc = -1;           /* index in path of %builtin, or -1 */
+//int exerrno = 0;                      /* Last exec error */
+
+
+STATIC void tryexec(shinstance *, char *, char **, char **, int, int);
+STATIC void execinterp(shinstance *, char **, char **);
+STATIC void printentry(shinstance *, struct tblentry *, int);
+STATIC void clearcmdentry(shinstance *, int);
+STATIC struct tblentry *cmdlookup(shinstance *, const char *, int);
+STATIC void delete_cmd_entry(shinstance *);
 #ifdef PC_EXE_EXTS
-STATIC int stat_pc_exec_exts(char *fullname, struct stat *st, int has_ext);
+STATIC int stat_pc_exec_exts(shinstance *, char *fullname, struct stat *st, int has_ext);
 #endif
 
@@ -125 +126 @@
 
 void
-shellexec(char **argv, char **envp, const char *path, int idx, int vforked)
+shellexec(shinstance *psh, char **argv, char **envp, const char *path, int idx, int vforked)
 {
         char *cmdname;
         int e;
 #ifdef PC_EXE_EXTS
-        int has_ext = strlen(argv[0]) - 4;
+        int has_ext = (int)strlen(argv[0]) - 4;
         has_ext = has_ext > 0
             && argv[0][has_ext] == '.'
@@ -148 +149 @@
                 cmdname = stalloc(psh, strlen(argv[0]) + 5);
                 strcpy(cmdname, argv[0]);
-                tryexec(cmdname, argv, envp, vforked, has_ext);
+                tryexec(psh, cmdname, argv, envp, vforked, has_ext);
                 TRACE((psh, "shellexec: cmdname=%s\n", cmdname));
                 stunalloc(psh, cmdname);
@@ -155 +156 @@
                 e = ENOENT;
                 while ((cmdname = padvance(psh, &path, argv[0])) != NULL) {
-                        if (--idx < 0 && pathopt == NULL) {
-                                tryexec(cmdname, argv, envp, vforked, has_ext);
+                        if (--idx < 0 && psh->pathopt == NULL) {
+                                tryexec(psh, cmdname, argv, envp, vforked, has_ext);
                                 if (errno != ENOENT && errno != ENOTDIR)
                                         e = errno;
@@ -167 +168 @@
         switch (e) {
         case EACCES:
-                exerrno = 126;
+                psh->exerrno = 126;
                 break;
         case ENOENT:
-                exerrno = 127;
+                psh->exerrno = 127;
                 break;
         default:
-                exerrno = 2;
+                psh->exerrno = 2;
                 break;
         }
         TRACE((psh, "shellexec failed for '%s', errno %d, vforked %d, suppressint %d\n",
-                argv[0], e, vforked, suppressint ));
+                argv[0], e, vforked, psh->suppressint ));
         exerror(psh, EXEXEC, "%s: %s", argv[0], errmsg(psh, e, E_EXEC));
         /* NOTREACHED */
@@ -184 +185 @@
 
 STATIC void
-tryexec(char *cmd, char **argv, char **envp, int vforked, int has_ext)
+tryexec(shinstance *psh, char *cmd, char **argv, char **envp, int vforked, int has_ext)
 {
         int e;
@@ -196 +197 @@
         struct stat st;
         if (!has_ext)
-            stat_pc_exec_exts(cmd, &st, 0);
+            stat_pc_exec_exts(psh, cmd, &st, 0);
 #endif
 #if defined __INNOTEK_LIBC__ && defined EXEC_HASH_BANG_SCRIPT
@@ -204 +205 @@
 #ifdef SYSV
         do {
-                execve(cmd, argv, envp);
+                sh_execve(psh, cmd, argv, envp);
         } while (errno == EINTR);
 #else
-        execve(cmd, argv, envp);
+        sh_execve(psh, cmd, argv, envp);
 #endif
         e = errno;
@@ -220 +221 @@
                 initshellproc(psh);
                 setinputfile(psh, cmd, 0);
-                commandname = arg0 = savestr(argv[0]);
+                psh->commandname = psh->arg0 = savestr(argv[0]);
 #ifdef EXEC_HASH_BANG_SCRIPT
                 pgetc(psh); pungetc(psh);               /* fill up input buffer */
-                p = parsenextc;
-                if (parsenleft > 2 && p[0] == '#' && p[1] == '!') {
+                p = psh->parsenextc;
+                if (psh->parsenleft > 2 && p[0] == '#' && p[1] == '!') {
                         argv[0] = cmd;
-                        execinterp(argv, envp);
+                        execinterp(psh, argv, envp);
                 }
 #endif
@@ -250 +251 @@
 
 STATIC void
-execinterp(char **argv, char **envp)
+execinterp(shinstance *psh, char **argv, char **envp)
 {
         int n;
@@ -263 +264 @@
         char **new;
 
-        n = parsenleft - 2;
-        inp = parsenextc + 2;
+        n = psh->parsenleft - 2;
+        inp = psh->parsenextc + 2;
         ap = newargs;
         for (;;) {
@@ -310 +311 @@
         while (*ap2++ = *ap++);
         TRACE((psh, "hash bang '%s'\n", new[0]));
-        shellexec(psh, new, envp, pathval(), 0, 0);
+        shellexec(psh, new, envp, pathval(psh), 0, 0);
         /* NOTREACHED */
 }
@@ -323 +324 @@
  * the possible path expansions in sequence.  If an option (indicated by
  * a percent sign) appears in the path entry then the global variable
- * pathopt will be set to point to it; otherwise pathopt will be set to
+ * psh->pathopt will be set to point to it; otherwise psh->pathopt will be set to
  * NULL.
  */
 
-const char *pathopt;
+//const char *pathopt;
 
 char *
-padvance(const char **path, const char *name)
+padvance(shinstance *psh, const char **path, const char *name)
 {
         const char *p;
@@ -345 +346 @@
         for (p = start ; *p && *p != ':' && *p != '%' ; p++);
 #endif
-        len = p - start + strlen(name) + 2;     /* "2" is for '/' and '\0' */
+        len = (int)(p - start + strlen(name) + 2);      /* "2" is for '/' and '\0' */
 #ifdef PC_EXE_EXTS
         len += 4; /* "4" is for .exe/.com/.cmd/.bat/.btm */
@@ -358 +359 @@
         }
         strcpy(q, name);
-        pathopt = NULL;
+        psh->pathopt = NULL;
         if (*p == '%') {
-                pathopt = ++p;
+                psh->pathopt = ++p;
 #ifdef PC_PATH_SEP
                 while (*p && *p != ';')  p++;
@@ -380 +381 @@
 
 #ifdef PC_EXE_EXTS
-STATIC int stat_pc_exec_exts(char *fullname, struct stat *st, int has_ext)
+STATIC int stat_pc_exec_exts(shinstance *psh, char *fullname, struct stat *st, int has_ext)
 {
     /* skip the SYSV crap */
-    if (stat(fullname, st) >= 0)
+    if (shfile_stat(&psh->fdtab, fullname, st) >= 0)
         return 0;
     if (!has_ext && errno == ENOENT)
@@ -389 +390 @@
         char *psz = strchr(fullname, '\0');
         memcpy(psz, ".exe", 5);
-        if (stat(fullname, st) >= 0)
+        if (shfile_stat(&psh->fdtab, fullname, st) >= 0)
             return 0;
         if (errno != ENOENT && errno != ENOTDIR)
@@ -395 +396 @@
 
         memcpy(psz, ".cmd", 5);
-        if (stat(fullname, st) >= 0)
+        if (shfile_stat(&psh->fdtab, fullname, st) >= 0)
             return 0;
         if (errno != ENOENT && errno != ENOTDIR)
@@ -401 +402 @@
 
         memcpy(psz, ".bat", 5);
-        if (stat(fullname, st) >= 0)
+        if (shfile_stat(&psh->fdtab, fullname, st) >= 0)
             return 0;
         if (errno != ENOENT && errno != ENOTDIR)
@@ -407 +408 @@
 
         memcpy(psz, ".com", 5);
-        if (stat(fullname, st) >= 0)
+        if (shfile_stat(&psh->fdtab, fullname, st) >= 0)
             return 0;
         if (errno != ENOENT && errno != ENOTDIR)
@@ -413 +414 @@
 
         memcpy(psz, ".btm", 5);
-        if (stat(fullname, st) >= 0)
+        if (shfile_stat(&psh->fdtab, fullname, st) >= 0)
             return 0;
         *psz = '\0';
@@ -427 +428 @@
 
 int
-hashcmd(int argc, char **argv)
+hashcmd(shinstance *psh, int argc, char **argv)
 {
         struct tblentry **pp;
@@ -439 +440 @@
         while ((c = nextopt(psh, "rv")) != '\0') {
                 if (c == 'r') {
-                        clearcmdentry(0);
+                        clearcmdentry(psh, 0);
                 } else if (c == 'v') {
                         verbose++;
                 }
         }
-        if (*argptr == NULL) {
-                for (pp = cmdtable ; pp < &cmdtable[CMDTABLESIZE] ; pp++) {
+        if (*psh->argptr == NULL) {
+                for (pp = psh->cmdtable ; pp < &psh->cmdtable[CMDTABLESIZE] ; pp++) {
                         for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) {
                                 if (verbose || cmdp->cmdtype == CMDNORMAL)
-                                        printentry(cmdp, verbose);
+                                        printentry(psh, cmdp, verbose);
                         }
                 }
                 return 0;
         }
-        while ((name = *argptr) != NULL) {
-                if ((cmdp = cmdlookup(name, 0)) != NULL
+        while ((name = *psh->argptr) != NULL) {
+                if ((cmdp = cmdlookup(psh, name, 0)) != NULL
                  && (cmdp->cmdtype == CMDNORMAL
-                     || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0)))
-                        delete_cmd_entry();
-                find_command(psh, name, &entry, DO_ERR, pathval());
+                     || (cmdp->cmdtype == CMDBUILTIN && psh->builtinloc >= 0)))
+                        delete_cmd_entry(psh);
+                find_command(psh, name, &entry, DO_ERR, pathval(psh));
                 if (verbose) {
                         if (entry.cmdtype != CMDUNKNOWN) {      /* if no error msg */
-                                cmdp = cmdlookup(name, 0);
-                                printentry(cmdp, verbose);
+                                cmdp = cmdlookup(psh, name, 0);
+                                printentry(psh, cmdp, verbose);
                         }
                         output_flushall(psh);
                 }
-                argptr++;
+                psh->argptr++;
         }
         return 0;
@@ -473 +474 @@
 
 STATIC void
-printentry(struct tblentry *cmdp, int verbose)
+printentry(shinstance *psh, struct tblentry *cmdp, int verbose)
 {
         int idx;
@@ -482 +483 @@
         case CMDNORMAL:
                 idx = cmdp->param.index;
-                path = pathval();
+                path = pathval(psh);
                 do {
                         name = padvance(psh, &path, cmdp->cmdname);
@@ -523 +524 @@
 
 void
-find_command(char *name, struct cmdentry *entry, int act, const char *path)
+find_command(shinstance *psh, char *name, struct cmdentry *entry, int act, const char *path)
 {
         struct tblentry *cmdp, loc_cmd;
@@ -531 +532 @@
         struct stat statb;
         int e;
-        int (*bltin)(int,char **);
+        int (*bltin)(shinstance*,int,char **);
 
 #ifdef PC_EXE_EXTS
-        int has_ext = strlen(name) - 4;
+        int has_ext = (int)(strlen(name) - 4);
         has_ext = has_ext > 0
             && name[has_ext] == '.'
@@ -550 +551 @@
         if (strchr(name, '/') != NULL) {
                 if (act & DO_ABS) {
-                        while (stat(name, &statb) < 0) {
+                        while (shfile_stat(&psh->fdtab, name, &statb) < 0) {
 #ifdef SYSV
                                 if (errno == EINTR)
@@ -570 +571 @@
         }
 
-        if (path != pathval())
+        if (path != pathval(psh))
                 act |= DO_ALTPATH;
 
@@ -577 +578 @@
 
         /* If name is in the table, check answer will be ok */
-        if ((cmdp = cmdlookup(name, 0)) != NULL) {
+        if ((cmdp = cmdlookup(psh, name, 0)) != NULL) {
                 do {
                         switch (cmdp->cmdtype) {
@@ -593 +594 @@
                                 break;
                         case CMDBUILTIN:
-                                if ((act & DO_ALTBLTIN) || builtinloc >= 0) {
+                                if ((act & DO_ALTBLTIN) || psh->builtinloc >= 0) {
                                         cmdp = NULL;
                                         continue;
@@ -606 +607 @@
 
         /* If %builtin not in path, check for builtin next */
-        if ((act & DO_ALTPATH ? !(act & DO_ALTBLTIN) : builtinloc < 0) &&
+        if ((act & DO_ALTPATH ? !(act & DO_ALTBLTIN) : psh->builtinloc < 0) &&
             (bltin = find_builtin(psh, name)) != 0)
                 goto builtin_success;
@@ -614 +615 @@
         if (cmdp) {             /* doing a rehash */
                 if (cmdp->cmdtype == CMDBUILTIN)
-                        prev = builtinloc;
+                        prev = psh->builtinloc;
                 else
                         prev = cmdp->param.index;
@@ -625 +626 @@
                 stunalloc(psh, fullname);
                 idx++;
-                if (pathopt) {
-                        if (prefix("builtin", pathopt)) {
+                if (psh->pathopt) {
+                        if (prefix("builtin", psh->pathopt)) {
                                 if ((bltin = find_builtin(psh, name)) == 0)
                                         goto loop;
                                 goto builtin_success;
-                        } else if (prefix("func", pathopt)) {
+                        } else if (prefix("func", psh->pathopt)) {
                                 /* handled below */
                         } else {
@@ -645 +646 @@
                 }
 #ifdef PC_EXE_EXTS
-                while (stat_pc_exec_exts(fullname, &statb, has_ext) < 0) {
+                while (stat_pc_exec_exts(psh, fullname, &statb, has_ext) < 0) {
 #else
-                while (stat(fullname, &statb) < 0) {
+                while (shfile_stat(&psh->fdtab, fullname, &statb) < 0) {
 #endif
 #ifdef SYSV
@@ -661 +662 @@
                 if (!S_ISREG(statb.st_mode))
                         goto loop;
-                if (pathopt) {          /* this is a %func directory */
+                if (psh->pathopt) {             /* this is a %func directory */
                         if (act & DO_NOFUNC)
                                 goto loop;
                         stalloc(psh, strlen(fullname) + 1);
                         readcmdfile(psh, fullname);
-                        if ((cmdp = cmdlookup(name, 0)) == NULL ||
+                        if ((cmdp = cmdlookup(psh, name, 0)) == NULL ||
                             cmdp->cmdtype != CMDFUNCTION)
                                 error(psh, "%s not defined in %s", name, fullname);
@@ -692 +693 @@
                         cmdp = &loc_cmd;
                 } else
-                        cmdp = cmdlookup(name, 1);
+                        cmdp = cmdlookup(psh, name, 1);
                 cmdp->cmdtype = CMDNORMAL;
                 cmdp->param.index = idx;
@@ -701 +702 @@
         /* We failed.  If there was an entry for this command, delete it */
         if (cmdp)
-                delete_cmd_entry();
+                delete_cmd_entry(psh);
         if (act & DO_ERR)
                 outfmt(psh->out2, "%s: %s\n", name, errmsg(psh, e, E_EXEC));
@@ -712 +713 @@
                 cmdp = &loc_cmd;
         else
-                cmdp = cmdlookup(name, 1);
+                cmdp = cmdlookup(psh, name, 1);
         if (cmdp->cmdtype == CMDFUNCTION)
                 /* DO_NOFUNC must have been set */
@@ -732 +733 @@
 
 int
-(*find_builtin(name))(int, char **)
-        char *name;
+(*find_builtin(shinstance *psh, char *name))(shinstance *psh, int, char **)
 {
         const struct builtincmd *bp;
@@ -745 +745 @@
 
 int
-(*find_splbltin(name))(int, char **)
-        char *name;
+(*find_splbltin(shinstance *psh, char *name))(shinstance *psh, int, char **)
 {
         const struct builtincmd *bp;
@@ -765 +764 @@
 
 void
-hash_special_builtins(void)
+hash_special_builtins(shinstance *psh)
 {
         const struct builtincmd *bp;
@@ -771 +770 @@
 
         for (bp = splbltincmd ; bp->name ; bp++) {
-                cmdp = cmdlookup(bp->name, 1);
+                cmdp = cmdlookup(psh, bp->name, 1);
                 cmdp->cmdtype = CMDSPLBLTIN;
                 cmdp->param.bltin = bp->builtin;
@@ -785 +784 @@
 
 void
-hashcd(void)
+hashcd(shinstance *psh)
 {
         struct tblentry **pp;
         struct tblentry *cmdp;
 
-        for (pp = cmdtable ; pp < &cmdtable[CMDTABLESIZE] ; pp++) {
+        for (pp = psh->cmdtable ; pp < &psh->cmdtable[CMDTABLESIZE] ; pp++) {
                 for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) {
                         if (cmdp->cmdtype == CMDNORMAL
-                         || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0))
+                         || (cmdp->cmdtype == CMDBUILTIN && psh->builtinloc >= 0))
                                 cmdp->rehash = 1;
                 }
@@ -804 +803 @@
  * Fix command hash table when PATH changed.
  * Called before PATH is changed.  The argument is the new value of PATH;
- * pathval() still returns the old value at this point.
+ * pathval(psh) still returns the old value at this point.
  * Called with interrupts off.
  */
 
 void
-changepath(const char *newval)
+changepath(shinstance *psh, const char *newval)
 {
         const char *old, *new;
@@ -816 +815 @@
         int bltin;
 
-        old = pathval();
+        old = pathval(psh);
         new = newval;
         firstchange = 9999;     /* assume no change */
@@ -847 +846 @@
                 new++, old++;
         }
-        if (builtinloc < 0 && bltin >= 0)
-                builtinloc = bltin;             /* zap builtins */
-        if (builtinloc >= 0 && bltin < 0)
+        if (psh->builtinloc < 0 && bltin >= 0)
+                psh->builtinloc = bltin;                /* zap builtins */
+        if (psh->builtinloc >= 0 && bltin < 0)
                 firstchange = 0;
-        clearcmdentry(firstchange);
-        builtinloc = bltin;
+        clearcmdentry(psh, firstchange);
+        psh->builtinloc = bltin;
 }
 
@@ -862 +861 @@
 
 STATIC void
-clearcmdentry(int firstchange)
+clearcmdentry(shinstance *psh, int firstchange)
 {
         struct tblentry **tblp;
@@ -869 +868 @@
 
         INTOFF;
-        for (tblp = cmdtable ; tblp < &cmdtable[CMDTABLESIZE] ; tblp++) {
+        for (tblp = psh->cmdtable ; tblp < &psh->cmdtable[CMDTABLESIZE] ; tblp++) {
                 pp = tblp;
                 while ((cmdp = *pp) != NULL) {
@@ -875 +874 @@
                              cmdp->param.index >= firstchange)
                          || (cmdp->cmdtype == CMDBUILTIN &&
-                             builtinloc >= firstchange)) {
+                             psh->builtinloc >= firstchange)) {
                                 *pp = cmdp->next;
                                 ckfree(cmdp);
@@ -905 +904 @@
 
 void
-deletefuncs(void)
+deletefuncs(shinstance *psh)
 {
         struct tblentry **tblp;
@@ -912 +911 @@
 
         INTOFF;
-        for (tblp = cmdtable ; tblp < &cmdtable[CMDTABLESIZE] ; tblp++) {
+        for (tblp = psh->cmdtable ; tblp < &psh->cmdtable[CMDTABLESIZE] ; tblp++) {
                 pp = tblp;
                 while ((cmdp = *pp) != NULL) {
@@ -941 +940 @@
 
 STATIC struct tblentry *
-cmdlookup(const char *name, int add)
+cmdlookup(shinstance *psh, const char *name, int add)
 {
         int hashval;
@@ -953 +952 @@
                 hashval += *p++;
         hashval &= 0x7FFF;
-        pp = &cmdtable[hashval % CMDTABLESIZE];
+        pp = &psh->cmdtable[hashval % CMDTABLESIZE];
         for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) {
                 if (equal(cmdp->cmdname, name))
@@ -978 +977 @@
 
 STATIC void
-delete_cmd_entry(void)
+delete_cmd_entry(shinstance *psh)
 {
         struct tblentry *cmdp;
@@ -993 +992 @@
 #ifdef notdef
 void
-getcmdentry(char *name, struct cmdentry *entry)
-{
-        struct tblentry *cmdp = cmdlookup(name, 0);
+getcmdentry(shinstance *psh, char *name, struct cmdentry *entry)
+{
+        struct tblentry *cmdp = cmdlookup(psh, name, 0);
 
         if (cmdp) {
@@ -1014 +1013 @@
 
 STATIC void
-addcmdentry(char *name, struct cmdentry *entry)
+addcmdentry(shinstance *psh, char *name, struct cmdentry *entry)
 {
         struct tblentry *cmdp;
 
         INTOFF;
-        cmdp = cmdlookup(name, 1);
+        cmdp = cmdlookup(psh, name, 1);
         if (cmdp->cmdtype != CMDSPLBLTIN) {
                 if (cmdp->cmdtype == CMDFUNCTION) {
@@ -1036 +1035 @@
 
 void
-defun(char *name, union node *func)
+defun(shinstance *psh,char *name, union node *func)
 {
         struct cmdentry entry;
@@ -1053 +1052 @@
 
 int
-unsetfunc(char *name)
+unsetfunc(shinstance *psh, char *name)
 {
         struct tblentry *cmdp;
 
-        if ((cmdp = cmdlookup(name, 0)) != NULL &&
+        if ((cmdp = cmdlookup(psh, name, 0)) != NULL &&
             cmdp->cmdtype == CMDFUNCTION) {
                 freefunc(cmdp->param.func);
-                delete_cmd_entry();
+                delete_cmd_entry(psh);
                 return (0);
         }
@@ -1072 +1071 @@
 
 int
-typecmd(int argc, char **argv)
+typecmd(shinstance *psh, int argc, char **argv)
 {
         struct cmdentry entry;
@@ -1096 +1095 @@
                 error(psh, "cannot specify -p with -v or -V");
 
-        while ((arg = *argptr++)) {
+        while ((arg = *psh->argptr++)) {
                 if (!v_flag)
                         out1str(psh, arg);
@@ -1121 +1120 @@
 
                 /* Then check if it is a tracked alias */
-                if ((cmdp = cmdlookup(arg, 0)) != NULL) {
+                if ((cmdp = cmdlookup(psh, arg, 0)) != NULL) {
                         entry.cmdtype = cmdp->cmdtype;
                         entry.u = cmdp->param;
                 } else {
                         /* Finally use brute force */
-                        find_command(psh, arg, &entry, DO_ABS, pathval());
+                        find_command(psh, arg, &entry, DO_ABS, pathval(psh));
                 }
 
@@ -1132 +1131 @@
                 case CMDNORMAL: {
                         if (strchr(arg, '/') == NULL) {
-                                const char *path = pathval();
+                                const char *path = pathval(psh);
                                 char *name;
                                 int j = entry.u.index;

trunk/src/kash/exec.h

@@ -34 +34 @@
  *      @(#)exec.h      8.3 (Berkeley) 6/8/95
  */
+
+#ifndef ___exec_h
+#define ___exec_h
 
 /* values of cmdtype */
@@ -78 +81 @@
 int typecmd(struct shinstance *, int, char **);
 void hash_special_builtins(struct shinstance *);
+
+#endif

trunk/src/kash/expand.c

@@ -78 +78 @@
 #include "mystring.h"
 #include "show.h"
-
-/*
- * Structure specifying which parts of the string should be searched
- * for IFS characters.
- */
-
-struct ifsregion {
-        struct ifsregion *next; /* next region in list */
-        int begoff;             /* offset of start of region */
-        int endoff;             /* offset of end of region */
-        int inquotes;           /* search for nul bytes only */
-};
-
-
-char *expdest;                  /* output of current string */
-struct nodelist *argbackq;      /* list of back quote expressions */
-struct ifsregion ifsfirst;      /* first struct in list of ifs regions */
-struct ifsregion *ifslastp;     /* last struct in list */
-struct arglist exparg;          /* holds expanded arg list */
-
-STATIC void argstr(char *, int);
-STATIC char *exptilde(char *, int);
-STATIC void expbackq(union node *, int, int);
-STATIC int subevalvar(char *, char *, int, int, int, int);
-STATIC char *evalvar(char *, int);
-STATIC int varisset(char *, int);
-STATIC void varvalue(char *, int, int, int);
-STATIC void recordregion(int, int, int);
-STATIC void removerecordregions(int);
-STATIC void ifsbreakup(char *, struct arglist *);
-STATIC void ifsfree(void);
-STATIC void expandmeta(struct strlist *, int);
-STATIC void expmeta(char *, char *);
-STATIC void addfname(char *);
+#include "shinstance.h"
+
+///*
+// * Structure specifying which parts of the string should be searched
+// * for IFS characters.
+// */
+//
+//struct ifsregion {
+//      struct ifsregion *next; /* next region in list */
+//      int begoff;             /* offset of start of region */
+//      int endoff;             /* offset of end of region */
+//      int inquotes;           /* search for nul bytes only */
+//};
+//
+//
+//char *expdest;                        /* output of current string */
+//struct nodelist *argbackq;    /* list of back quote expressions */
+//struct ifsregion ifsfirst;    /* first struct in list of ifs regions */
+//struct ifsregion *ifslastp;   /* last struct in list */
+//struct arglist exparg;                /* holds expanded arg list */
+
+STATIC void argstr(shinstance *, char *, int);
+STATIC char *exptilde(shinstance *, char *, int);
+STATIC void expbackq(shinstance *, union node *, int, int);
+STATIC int subevalvar(shinstance *, char *, char *, int, int, int, int);
+STATIC char *evalvar(shinstance *, char *, int);
+STATIC int varisset(shinstance *, char *, int);
+STATIC void varvalue(shinstance *, char *, int, int, int);
+STATIC void recordregion(shinstance *, int, int, int);
+STATIC void removerecordregions(shinstance *, int);
+STATIC void ifsbreakup(shinstance *, char *, struct arglist *);
+STATIC void ifsfree(shinstance *);
+STATIC void expandmeta(shinstance *, struct strlist *, int);
+STATIC void expmeta(shinstance *, char *, char *);
+STATIC void addfname(shinstance *, char *);
 STATIC struct strlist *expsort(struct strlist *);
 STATIC struct strlist *msort(struct strlist *, int);
 STATIC int pmatch(char *, char *, int);
-STATIC char *cvtnum(int, char *);
+STATIC char *cvtnum(shinstance *, int, char *);
 
 /*
@@ -138 +139 @@
 
 void
-expandarg(union node *arg, struct arglist *arglist, int flag)
+expandarg(shinstance *psh, union node *arg, struct arglist *arglist, int flag)
 {
         struct strlist *sp;
         char *p;
 
-        argbackq = arg->narg.backquote;
-        STARTSTACKSTR(psh, expdest);
-        ifsfirst.next = NULL;
-        ifslastp = NULL;
-        argstr(arg->narg.text, flag);
+        psh->argbackq = arg->narg.backquote;
+        STARTSTACKSTR(psh, psh->expdest);
+        psh->ifsfirst.next = NULL;
+        psh->ifslastp = NULL;
+        argstr(psh, arg->narg.text, flag);
         if (arglist == NULL) {
                 return;                 /* here document expanded */
         }
-        STPUTC(psh, '\0', expdest);
-        p = grabstackstr(psh, expdest);
-        exparg.lastp = &exparg.list;
+        STPUTC(psh, '\0', psh->expdest);
+        p = grabstackstr(psh, psh->expdest);
+        psh->exparg.lastp = &psh->exparg.list;
         /*
          * TODO - EXP_REDIR
          */
         if (flag & EXP_FULL) {
-                ifsbreakup(p, &exparg);
-                *exparg.lastp = NULL;
-                exparg.lastp = &exparg.list;
-                expandmeta(exparg.list, flag);
+                ifsbreakup(psh, p, &psh->exparg);
+                *psh->exparg.lastp = NULL;
+                psh->exparg.lastp = &psh->exparg.list;
+                expandmeta(psh, psh->exparg.list, flag);
         } else {
                 if (flag & EXP_REDIR) /*XXX - for now, just remove escapes */
@@ -167 +168 @@
                 sp = (struct strlist *)stalloc(psh, sizeof (struct strlist));
                 sp->text = p;
-                *exparg.lastp = sp;
-                exparg.lastp = &sp->next;
-        }
-        ifsfree();
-        *exparg.lastp = NULL;
-        if (exparg.list) {
-                *arglist->lastp = exparg.list;
-                arglist->lastp = exparg.lastp;
+                *psh->exparg.lastp = sp;
+                psh->exparg.lastp = &sp->next;
+        }
+        ifsfree(psh);
+        *psh->exparg.lastp = NULL;
+        if (psh->exparg.list) {
+                *arglist->lastp = psh->exparg.list;
+                arglist->lastp = psh->exparg.lastp;
         }
 }
@@ -187 +188 @@
 
 STATIC void
-argstr(char *p, int flag)
+argstr(shinstance *psh, char *p, int flag)
 {
         char c;
@@ -196 +197 @@
 
         if (flag & EXP_IFS_SPLIT)
-                ifs = ifsset() ? ifsval() : " \t\n";
+                ifs = ifsset(psh) ? ifsval(psh) : " \t\n";
 
         if (*p == '~' && (flag & (EXP_TILDE | EXP_VARTILDE)))
-                p = exptilde(p, flag);
+                p = exptilde(psh, p, flag);
         for (;;) {
                 switch (c = *p++) {
@@ -210 +211 @@
                                 break;
                         if ((flag & EXP_FULL) != 0)
-                                STPUTC(psh, c, expdest);
+                                STPUTC(psh, c, psh->expdest);
                         ifs_split = 0;
                         break;
@@ -218 +219 @@
                 case CTLESC:
                         if (quotes)
-                                STPUTC(psh, c, expdest);
+                                STPUTC(psh, c, psh->expdest);
                         c = *p++;
-                        STPUTC(psh, c, expdest);
+                        STPUTC(psh, c, psh->expdest);
                         break;
                 case CTLVAR:
-                        p = evalvar(p, (flag & ~EXP_IFS_SPLIT) | (flag & ifs_split));
+                        p = evalvar(psh, p, (flag & ~EXP_IFS_SPLIT) | (flag & ifs_split));
                         break;
                 case CTLBACKQ:
                 case CTLBACKQ|CTLQUOTE:
-                        expbackq(argbackq->n, c & CTLQUOTE, flag);
-                        argbackq = argbackq->next;
+                        expbackq(psh, psh->argbackq->n, c & CTLQUOTE, flag);
+                        psh->argbackq = psh->argbackq->next;
                         break;
                 case CTLENDARI:
@@ -239 +240 @@
                          * assignments (after the first '=' and after ':'s).
                          */
-                        STPUTC(psh, c, expdest);
+                        STPUTC(psh, c, psh->expdest);
                         if (flag & EXP_VARTILDE && *p == '~') {
                                 if (c == '=') {
@@ -247 +248 @@
                                                 break;
                                 }
-                                p = exptilde(p, flag);
+                                p = exptilde(psh, p, flag);
                         }
                         break;
                 default:
-                        STPUTC(psh, c, expdest);
+                        STPUTC(psh, c, psh->expdest);
                         if (flag & EXP_IFS_SPLIT & ifs_split && strchr(ifs, c) != NULL) {
                                 /* We need to get the output split here... */
-                                recordregion(expdest - stackblock(psh) - 1,
-                                                expdest - stackblock(psh), 0);
+                                recordregion(psh, (int)(psh->expdest - stackblock(psh) - 1),
+                                                (int)(psh->expdest - stackblock(psh)), 0);
                         }
                         break;
@@ -263 +264 @@
 
 STATIC char *
-exptilde(char *p, int flag)
+exptilde(shinstance *psh, char *p, int flag)
 {
         char c, *startp = p;
@@ -300 +301 @@
         while ((c = *home++) != '\0') {
                 if (quotes && SQSYNTAX[(int)c] == CCTL)
-                        STPUTC(psh, CTLESC, expdest);
-                STPUTC(psh, c, expdest);
+                        STPUTC(psh, CTLESC, psh->expdest);
+                STPUTC(psh, c, psh->expdest);
         }
         return (p);
@@ -311 +312 @@
 
 STATIC void
-removerecordregions(int endoff)
-{
-        if (ifslastp == NULL)
+removerecordregions(shinstance *psh, int endoff)
+{
+        if (psh->ifslastp == NULL)
                 return;
 
-        if (ifsfirst.endoff > endoff) {
-                while (ifsfirst.next != NULL) {
+        if (psh->ifsfirst.endoff > endoff) {
+                while (psh->ifsfirst.next != NULL) {
                         struct ifsregion *ifsp;
                         INTOFF;
-                        ifsp = ifsfirst.next->next;
-                        ckfree(ifsfirst.next);
-                        ifsfirst.next = ifsp;
+                        ifsp = psh->ifsfirst.next->next;
+                        ckfree(psh->ifsfirst.next);
+                        psh->ifsfirst.next = ifsp;
                         INTON;
                 }
-                if (ifsfirst.begoff > endoff)
-                        ifslastp = NULL;
+                if (psh->ifsfirst.begoff > endoff)
+                        psh->ifslastp = NULL;
                 else {
-                        ifslastp = &ifsfirst;
-                        ifsfirst.endoff = endoff;
+                        psh->ifslastp = &psh->ifsfirst;
+                        psh->ifsfirst.endoff = endoff;
                 }
                 return;
         }
 
-        ifslastp = &ifsfirst;
-        while (ifslastp->next && ifslastp->next->begoff < endoff)
-                ifslastp=ifslastp->next;
-        while (ifslastp->next != NULL) {
+        psh->ifslastp = &psh->ifsfirst;
+        while (psh->ifslastp->next && psh->ifslastp->next->begoff < endoff)
+                psh->ifslastp=psh->ifslastp->next;
+        while (psh->ifslastp->next != NULL) {
                 struct ifsregion *ifsp;
                 INTOFF;
-                ifsp = ifslastp->next->next;
-                ckfree(ifslastp->next);
-                ifslastp->next = ifsp;
+                ifsp = psh->ifslastp->next->next;
+                ckfree(psh->ifslastp->next);
+                psh->ifslastp->next = ifsp;
                 INTON;
         }
-        if (ifslastp->endoff > endoff)
-                ifslastp->endoff = endoff;
+        if (psh->ifslastp->endoff > endoff)
+                psh->ifslastp->endoff = endoff;
 }
 
@@ -355 +356 @@
  */
 void
-expari(int flag)
+expari(shinstance *psh, int flag)
 {
         char *p, *start;
@@ -378 +379 @@
 #error "integers with more than 10 digits are not supported"
 #endif
-        CHECKSTRSPACE(psh, 12 - 2, expdest);
-        USTPUTC(psh, '\0', expdest);
+        CHECKSTRSPACE(psh, 12 - 2, psh->expdest);
+        USTPUTC(psh, '\0', psh->expdest);
         start = stackblock(psh);
-        p = expdest - 1;
+        p = psh->expdest - 1;
         while (*p != CTLARI && p >= start)
                 --p;
@@ -395 +396 @@
         else
                 quoted=0;
-        begoff = p - start;
-        removerecordregions(begoff);
+        begoff = (int)(p - start);
+        removerecordregions(psh, begoff);
         if (quotes)
                 rmescapes(psh, p+2);
@@ -406 +407 @@
 
         if (quoted == 0)
-                recordregion(begoff, p - 1 - start, 0);
-        result = expdest - p + 1;
-        STADJUST(psh, -result, expdest);
+                recordregion(psh, begoff, (int)(p - 1 - start), 0);
+        result = (int)(psh->expdest - p + 1);
+        STADJUST(psh, -result, psh->expdest);
 }
 
@@ -417 +418 @@
 
 STATIC void
-expbackq(union node *cmd, int quoted, int flag)
+expbackq(shinstance *psh, union node *cmd, int quoted, int flag)
 {
         struct backcmd in;
@@ -423 +424 @@
         char buf[128];
         char *p;
-        char *dest = expdest;
+        char *dest = psh->expdest;
         struct ifsregion saveifs, *savelastp;
         struct nodelist *saveargbackq;
         char lastc;
-        int startloc = dest - stackblock(psh);
+        int startloc = (int)(dest - stackblock(psh));
         char const *syntax = quoted? DQSYNTAX : BASESYNTAX;
         int saveherefd;
@@ -433 +434 @@
 
         INTOFF;
-        saveifs = ifsfirst;
-        savelastp = ifslastp;
-        saveargbackq = argbackq;
+        saveifs = psh->ifsfirst;
+        savelastp = psh->ifslastp;
+        saveargbackq = psh->argbackq;
         saveherefd = psh->herefd;
         psh->herefd = -1;
@@ -441 +442 @@
         evalbackcmd(psh, cmd, &in);
         ungrabstackstr(psh, p, dest);
-        ifsfirst = saveifs;
-        ifslastp = savelastp;
-        argbackq = saveargbackq;
+        psh->ifsfirst = saveifs;
+        psh->ifslastp = savelastp;
+        psh->argbackq = saveargbackq;
         psh->herefd = saveherefd;
 
@@ -477 +478 @@
                 ckfree(in.buf);
         if (in.jp)
-                back_exitstatus = waitforjob(psh, in.jp);
+                psh->back_exitstatus = waitforjob(psh, in.jp);
         if (quoted == 0)
-                recordregion(startloc, dest - stackblock(psh), 0);
+                recordregion(psh, startloc, (int)(dest - stackblock(psh)), 0);
         TRACE((psh, "evalbackq: size=%d: \"%.*s\"\n",
                 (dest - stackblock(psh)) - startloc,
                 (dest - stackblock(psh)) - startloc,
                 stackblock(psh) + startloc));
-        expdest = dest;
+        psh->expdest = dest;
         INTON;
 }
@@ -491 +492 @@
 
 STATIC int
-subevalvar(char *p, char *str, int strloc, int subtype, int startloc, int varflags)
+subevalvar(shinstance *psh, char *p, char *str, int strloc, int subtype, int startloc, int varflags)
 {
         char *startp;
@@ -498 +499 @@
         int c = 0;
         int saveherefd = psh->herefd;
-        struct nodelist *saveargbackq = argbackq;
+        struct nodelist *saveargbackq = psh->argbackq;
         int amount;
 
         psh->herefd = -1;
-        argstr(p, 0);
-        STACKSTRNUL(psh, expdest);
+        argstr(psh, p, 0);
+        STACKSTRNUL(psh, psh->expdest);
         psh->herefd = saveherefd;
-        argbackq = saveargbackq;
+        psh->argbackq = saveargbackq;
         startp = stackblock(psh) + startloc;
         if (str == NULL)
@@ -513 +514 @@
         case VSASSIGN:
                 setvar(psh, str, startp, 0);
-                amount = startp - expdest;
-                STADJUST(psh, amount, expdest);
+                amount = (int)(startp - psh->expdest);
+                STADJUST(psh, amount, psh->expdest);
                 varflags &= ~VSNUL;
                 if (c != 0)
@@ -592 +593 @@
 recordleft:
         *loc = c;
-        amount = ((str - 1) - (loc - startp)) - expdest;
-        STADJUST(psh, amount, expdest);
+        amount = (int)(((str - 1) - (loc - startp)) - psh->expdest);
+        STADJUST(psh, amount, psh->expdest);
         while (loc != str - 1)
                 *startp++ = *loc++;
@@ -599 +600 @@
 
 recordright:
-        amount = loc - expdest;
-        STADJUST(psh, amount, expdest);
-        STPUTC(psh, '\0', expdest);
-        STADJUST(psh, -1, expdest);
+        amount = (int)(loc - psh->expdest);
+        STADJUST(psh, amount, psh->expdest);
+        STPUTC(psh, '\0', psh->expdest);
+        STADJUST(psh, -1, psh->expdest);
         return 1;
 }
@@ -613 +614 @@
 
 STATIC char *
-evalvar(char *p, int flag)
+evalvar(shinstance *psh, char *p, int flag)
 {
         int subtype;
@@ -636 +637 @@
 again: /* jump here after setting a variable with ${var=text} */
         if (special) {
-                set = varisset(var, varflags & VSNUL);
+                set = varisset(psh, var, varflags & VSNUL);
                 val = NULL;
         } else {
@@ -648 +649 @@
 
         varlen = 0;
-        startloc = expdest - stackblock(psh);
+        startloc = (int)(psh->expdest - stackblock(psh));
 
         if (!set && uflag(psh)) {
@@ -666 +667 @@
                 /* insert the value of the variable */
                 if (special) {
-                        varvalue(var, varflags & VSQUOTE, subtype, flag);
+                        varvalue(psh, var, varflags & VSQUOTE, subtype, flag);
                         if (subtype == VSLENGTH) {
-                                varlen = expdest - stackblock(psh) - startloc;
-                                STADJUST(psh, -varlen, expdest);
+                                varlen = (int)(psh->expdest - stackblock(psh) - startloc);
+                                STADJUST(psh, -varlen, psh->expdest);
                         }
                 } else {
@@ -681 +682 @@
                                 while (*val) {
                                         if (quotes && syntax[(int)*val] == CCTL)
-                                                STPUTC(psh, CTLESC, expdest);
-                                        STPUTC(psh, *val++, expdest);
+                                                STPUTC(psh, CTLESC, psh->expdest);
+                                        STPUTC(psh, *val++, psh->expdest);
                                 }
 
@@ -691 +692 @@
 
         apply_ifs = ((varflags & VSQUOTE) == 0 ||
-                (*var == '@' && shellparam.nparam != 1));
+                (*var == '@' && psh->shellparam.nparam != 1));
 
         switch (subtype) {
         case VSLENGTH:
-                expdest = cvtnum(varlen, expdest);
+                psh->expdest = cvtnum(psh, varlen, psh->expdest);
                 break;
 
@@ -706 +707 @@
         case VSMINUS:
                 if (!set) {
-                        argstr(p, flag | (apply_ifs ? EXP_IFS_SPLIT : 0));
+                        argstr(psh, p, flag | (apply_ifs ? EXP_IFS_SPLIT : 0));
                         /*
                          * ${x-a b c} doesn't get split, but removing the
@@ -727 +728 @@
                  * right after it
                  */
-                STPUTC(psh, '\0', expdest);
-                patloc = expdest - stackblock(psh);
-                if (subevalvar(p, NULL, patloc, subtype,
+                STPUTC(psh, '\0', psh->expdest);
+                patloc = (int)(psh->expdest - stackblock(psh));
+                if (subevalvar(psh, p, NULL, patloc, subtype,
                                startloc, varflags) == 0) {
-                        int amount = (expdest - stackblock(psh) - patloc) + 1;
-                        STADJUST(psh, -amount, expdest);
+                        int amount = (int)(psh->expdest - stackblock(psh) - patloc) + 1;
+                        STADJUST(psh, -amount, psh->expdest);
                 }
                 /* Remove any recorded regions beyond start of variable */
-                removerecordregions(startloc);
+                removerecordregions(psh, startloc);
                 apply_ifs = 1;
                 break;
@@ -743 +744 @@
                 if (set)
                         break;
-                if (subevalvar(p, var, 0, subtype, startloc, varflags)) {
+                if (subevalvar(psh, p, var, 0, subtype, startloc, varflags)) {
                         varflags &= ~VSNUL;
                         /*
@@ -749 +750 @@
                          * start of variable
                          */
-                        removerecordregions(startloc);
+                        removerecordregions(psh, startloc);
                         goto again;
                 }
@@ -760 +761 @@
 
         if (apply_ifs)
-                recordregion(startloc, expdest - stackblock(psh),
+                recordregion(psh, startloc, (int)(psh->expdest - stackblock(psh)),
                              varflags & VSQUOTE);
 
@@ -770 +771 @@
                         else if (c == CTLBACKQ || c == (CTLBACKQ|CTLQUOTE)) {
                                 if (set)
-                                        argbackq = argbackq->next;
+                                        psh->argbackq = psh->argbackq->next;
                         } else if (c == CTLVAR) {
                                 if ((*p++ & VSTYPE) != VSNORMAL)
@@ -790 +791 @@
 
 STATIC int
-varisset(char *name, int nulok)
+varisset(shinstance *psh, char *name, int nulok)
 {
         if (*name == '!')
-                return backgndpid != -1;
+                return psh->backgndpid != -1;
         else if (*name == '@' || *name == '*') {
-                if (*shellparam.p == NULL)
+                if (*psh->shellparam.p == NULL)
                         return 0;
 
@@ -801 +802 @@
                         char **av;
 
-                        for (av = shellparam.p; *av; av++)
+                        for (av = psh->shellparam.p; *av; av++)
                                 if (**av != '\0')
                                         return 1;
@@ -810 +811 @@
                 int num = atoi(name);
 
-                if (num > shellparam.nparam)
+                if (num > psh->shellparam.nparam)
                         return 0;
 
                 if (num == 0)
-                        ap = arg0;
+                        ap = psh->arg0;
                 else
-                        ap = shellparam.p[num - 1];
+                        ap = psh->shellparam.p[num - 1];
 
                 if (nulok && (ap == NULL || *ap == '\0'))
@@ -831 +832 @@
 
 STATIC void
-varvalue(char *name, int quoted, int subtype, int flag)
+varvalue(shinstance *psh, char *name, int quoted, int subtype, int flag)
 {
         int num;
@@ -846 +847 @@
                 while (*p) { \
                         if (syntax[(int)*p] == CCTL) \
-                                STPUTC(psh, CTLESC, expdest); \
-                        STPUTC(psh, *p++, expdest); \
+                                STPUTC(psh, CTLESC, psh->expdest); \
+                        STPUTC(psh, *p++, psh->expdest); \
                 } \
         } else \
                 while (*p) \
-                        STPUTC(psh, *p++, expdest); \
+                        STPUTC(psh, *p++, psh->expdest); \
         } while (0)
 
@@ -857 +858 @@
         switch (*name) {
         case '$':
-                num = rootpid;
+                num = psh->rootpid;
                 goto numvar;
         case '?':
-                num = exitstatus;
+                num = psh->exitstatus;
                 goto numvar;
         case '#':
-                num = shellparam.nparam;
+                num = psh->shellparam.nparam;
                 goto numvar;
         case '!':
-                num = backgndpid;
+                num = psh->backgndpid;
 numvar:
-                expdest = cvtnum(num, expdest);
+                psh->expdest = cvtnum(psh, num, psh->expdest);
                 break;
         case '-':
-                for (i = 0; optlist[i].name; i++) {
-                        if (optlist[i].val)
-                                STPUTC(psh, optlist[i].letter, expdest);
+                for (i = 0; psh->optlist[i].name; i++) {
+                        if (psh->optlist[i].val)
+                                STPUTC(psh, psh->optlist[i].letter, psh->expdest);
                 }
                 break;
         case '@':
                 if (flag & EXP_FULL && quoted) {
-                        for (ap = shellparam.p ; (p = *ap++) != NULL ; ) {
+                        for (ap = psh->shellparam.p ; (p = *ap++) != NULL ; ) {
                                 STRTODEST(p);
                                 if (*ap)
-                                        STPUTC(psh, '\0', expdest);
+                                        STPUTC(psh, '\0', psh->expdest);
                         }
                         break;
@@ -887 +888 @@
                 /* fall through */
         case '*':
-                if (ifsset() != 0)
-                        sep = ifsval()[0];
+                if (ifsset(psh) != 0)
+                        sep = ifsval(psh)[0];
                 else
                         sep = ' ';
-                for (ap = shellparam.p ; (p = *ap++) != NULL ; ) {
+                for (ap = psh->shellparam.p ; (p = *ap++) != NULL ; ) {
                         STRTODEST(p);
                         if (*ap && sep)
-                                STPUTC(psh, sep, expdest);
+                                STPUTC(psh, sep, psh->expdest);
                 }
                 break;
         case '0':
-                p = arg0;
+                p = psh->arg0;
                 STRTODEST(p);
                 break;
@@ -904 +905 @@
                 if (is_digit(*name)) {
                         num = atoi(name);
-                        if (num > 0 && num <= shellparam.nparam) {
-                                p = shellparam.p[num - 1];
+                        if (num > 0 && num <= psh->shellparam.nparam) {
+                                p = psh->shellparam.p[num - 1];
                                 STRTODEST(p);
                         }
@@ -921 +922 @@
 
 STATIC void
-recordregion(int start, int end, int inquotes)
+recordregion(shinstance *psh, int start, int end, int inquotes)
 {
         struct ifsregion *ifsp;
 
-        if (ifslastp == NULL) {
-                ifsp = &ifsfirst;
+        if (psh->ifslastp == NULL) {
+                ifsp = &psh->ifsfirst;
         } else {
-                if (ifslastp->endoff == start
-                    && ifslastp->inquotes == inquotes) {
+                if (psh->ifslastp->endoff == start
+                    && psh->ifslastp->inquotes == inquotes) {
                         /* extend previous area */
-                        ifslastp->endoff = end;
+                        psh->ifslastp->endoff = end;
                         return;
                 }
                 ifsp = (struct ifsregion *)ckmalloc(sizeof (struct ifsregion));
-                ifslastp->next = ifsp;
-        }
-        ifslastp = ifsp;
-        ifslastp->next = NULL;
-        ifslastp->begoff = start;
-        ifslastp->endoff = end;
-        ifslastp->inquotes = inquotes;
+                psh->ifslastp->next = ifsp;
+        }
+        psh->ifslastp = ifsp;
+        psh->ifslastp->next = NULL;
+        psh->ifslastp->begoff = start;
+        psh->ifslastp->endoff = end;
+        psh->ifslastp->inquotes = inquotes;
 }
 
@@ -952 +953 @@
  */
 STATIC void
-ifsbreakup(char *string, struct arglist *arglist)
+ifsbreakup(shinstance *psh, char *string, struct arglist *arglist)
 {
         struct ifsregion *ifsp;
@@ -967 +968 @@
         inquotes = 0;
 
-        if (ifslastp == NULL) {
+        if (psh->ifslastp == NULL) {
                 /* Return entire argument, IFS doesn't apply to any of it */
                 sp = (struct strlist *)stalloc(psh, sizeof *sp);
@@ -976 +977 @@
         }
 
-        ifs = ifsset() ? ifsval() : " \t\n";
-
-        for (ifsp = &ifsfirst; ifsp != NULL; ifsp = ifsp->next) {
+        ifs = ifsset(psh) ? ifsval(psh) : " \t\n";
+
+        for (ifsp = &psh->ifsfirst; ifsp != NULL; ifsp = ifsp->next) {
                 p = string + ifsp->begoff;
                 inquotes = ifsp->inquotes;
@@ -1051 +1052 @@
 
 STATIC void
-ifsfree(void)
-{
-        while (ifsfirst.next != NULL) {
+ifsfree(shinstance *psh)
+{
+        while (psh->ifsfirst.next != NULL) {
                 struct ifsregion *ifsp;
                 INTOFF;
-                ifsp = ifsfirst.next->next;
-                ckfree(ifsfirst.next);
-                ifsfirst.next = ifsp;
+                ifsp = psh->ifsfirst.next->next;
+                ckfree(psh->ifsfirst.next);
+                psh->ifsfirst.next = ifsp;
                 INTON;
         }
-        ifslastp = NULL;
-        ifsfirst.next = NULL;
+        psh->ifslastp = NULL;
+        psh->ifsfirst.next = NULL;
 }
 
@@ -1069 +1070 @@
 /*
  * Expand shell metacharacters.  At this point, the only control characters
- * should be escapes.  The results are stored in the list exparg.
- */
-
-char *expdir;
+ * should be escapes.  The results are stored in the list psh->exparg.
+ */
+
+//char *expdir;
 
 
 STATIC void
-expandmeta(struct strlist *str, int flag)
+expandmeta(shinstance *psh, struct strlist *str, int flag)
 {
         char *p;
@@ -1094 +1095 @@
                                 break;
                 }
-                savelastp = exparg.lastp;
+                savelastp = psh->exparg.lastp;
                 INTOFF;
-                if (expdir == NULL) {
-                        int i = strlen(str->text);
-                        expdir = ckmalloc(i < 2048 ? 2048 : i); /* XXX */
-                }
-
-                expmeta(expdir, str->text);
-                ckfree(expdir);
-                expdir = NULL;
+                if (psh->expdir == NULL) {
+                        size_t i = strlen(str->text);
+                        psh->expdir = ckmalloc(i < 2048 ? 2048 : i); /* XXX */
+                }
+
+                expmeta(psh, psh->expdir, str->text);
+                ckfree(psh->expdir);
+                psh->expdir = NULL;
                 INTON;
-                if (exparg.lastp == savelastp) {
+                if (psh->exparg.lastp == savelastp) {
                         /*
                          * no matches
                          */
 nometa:
-                        *exparg.lastp = str;
+                        *psh->exparg.lastp = str;
                         rmescapes(psh, str->text);
-                        exparg.lastp = &str->next;
+                        psh->exparg.lastp = &str->next;
                 } else {
-                        *exparg.lastp = NULL;
+                        *psh->exparg.lastp = NULL;
                         *savelastp = sp = expsort(*savelastp);
                         while (sp->next != NULL)
                                 sp = sp->next;
-                        exparg.lastp = &sp->next;
+                        psh->exparg.lastp = &sp->next;
                 }
                 str = str->next;
@@ -1130 +1131 @@
 
 STATIC void
-expmeta(char *enddir, char *name)
+expmeta(shinstance *psh, char *enddir, char *name)
 {
         char *p;
@@ -1180 +1181 @@
         }
         if (metaflag == 0) {    /* we've reached the end of the file name */
-                if (enddir != expdir)
+                if (enddir != psh->expdir)
                         metaflag++;
                 for (p = name ; ; p++) {
@@ -1191 +1192 @@
                                 break;
                 }
-                if (metaflag == 0 || lstat(expdir, &statb) >= 0)
-                        addfname(expdir);
+                if (metaflag == 0 || lstat(psh->expdir, &statb) >= 0)
+                        addfname(psh, psh->expdir);
                 return;
         }
@@ -1206 +1207 @@
                 }
         }
-        if (enddir == expdir) {
+        if (enddir == psh->expdir) {
                 cp = ".";
-        } else if (enddir == expdir + 1 && *expdir == '/') {
+        } else if (enddir == psh->expdir + 1 && *psh->expdir == '/') {
                 cp = "/";
         } else {
-                cp = expdir;
+                cp = psh->expdir;
                 enddir[-1] = '\0';
         }
         if ((dirp = opendir(cp)) == NULL)
                 return;
-        if (enddir != expdir)
+        if (enddir != psh->expdir)
                 enddir[-1] = '/';
         if (*endname == 0) {
@@ -1238 +1239 @@
                         if (atend) {
                                 scopy(dp->d_name, enddir);
-                                addfname(expdir);
+                                addfname(psh, psh->expdir);
                         } else {
                                 for (p = enddir, cp = dp->d_name;
@@ -1244 +1245 @@
                                         continue;
                                 p[-1] = '/';
-                                expmeta(p, endname);
+                                expmeta(psh, p, endname);
                         }
                 }
@@ -1259 +1260 @@
 
 STATIC void
-addfname(char *name)
+addfname(shinstance *psh, char *name)
 {
         char *p;
@@ -1268 +1269 @@
         sp = (struct strlist *)stalloc(psh, sizeof *sp);
         sp->text = p;
-        *exparg.lastp = sp;
-        exparg.lastp = &sp->next;
+        *psh->exparg.lastp = sp;
+        psh->exparg.lastp = &sp->next;
 }
 
@@ -1339 +1340 @@
 
 int
-patmatch(char *pattern, char *string, int squoted)
+patmatch(shinstance *psh, char *pattern, char *string, int squoted)
 {
 #ifdef notdef
@@ -1474 +1475 @@
 
 void
-rmescapes(char *str)
+rmescapes(shinstance *psh, char *str)
 {
         char *p, *q;
@@ -1503 +1504 @@
 
 int
-casematch(union node *pattern, char *val)
+casematch(shinstance *psh, union node *pattern, char *val)
 {
         struct stackmark smark;
@@ -1510 +1511 @@
 
         setstackmark(psh, &smark);
-        argbackq = pattern->narg.backquote;
-        STARTSTACKSTR(psh, expdest);
-        ifslastp = NULL;
-        argstr(pattern->narg.text, EXP_TILDE | EXP_CASE);
-        STPUTC(psh, '\0', expdest);
-        p = grabstackstr(psh, expdest);
+        psh->argbackq = pattern->narg.backquote;
+        STARTSTACKSTR(psh, psh->expdest);
+        psh->ifslastp = NULL;
+        argstr(psh, pattern->narg.text, EXP_TILDE | EXP_CASE);
+        STPUTC(psh, '\0', psh->expdest);
+        p = grabstackstr(psh, psh->expdest);
         result = patmatch(psh, p, val, 0);
         popstackmark(psh, &smark);
@@ -1526 +1527 @@
 
 STATIC char *
-cvtnum(int num, char *buf)
+cvtnum(shinstance *psh, int num, char *buf)
 {
         char temp[32];

trunk/src/kash/expand.h

@@ -34 +34 @@
  *      @(#)expand.h    8.2 (Berkeley) 5/4/95
  */
+
+#ifndef ___expand_h
+#define ___expand_h
 
 struct strlist {
@@ -71 +74 @@
 void arith_lex_reset(void);
 int yylex(void);
+
+#endif

trunk/src/kash/generated/init.c

@@ -210 +210 @@
       /* from eval.c: */
       {
-              evalskip = 0;
-              loopnest = 0;
-              funcnest = 0;
+              psh->evalskip = 0;
+              psh->loopnest = 0;
+              psh->funcnest = 0;
       }
 
       /* from input.c: */
       {
-              if (exception != EXSHELLPROC)
-                      parselleft = parsenleft = 0;      /* clear input buffer */
+              if (psh->exception != EXSHELLPROC)
+                      psh->parselleft = psh->parsenleft = 0;    /* clear input buffer */
               popallfiles(psh);
       }
@@ -234 +234 @@
       /* from parser.c: */
       {
-              tokpushback = 0;
-              checkkwd = 0;
+              psh->tokpushback = 0;
+              psh->checkkwd = 0;
       }
 
       /* from redir.c: */
       {
-              while (redirlist)
+              while (psh->redirlist)
                       popredir(psh);
       }
@@ -261 +261 @@
       /* from eval.c: */
       {
-              exitstatus = 0;
+              psh->exitstatus = 0;
       }
 
@@ -276 +276 @@
       /* from jobs.c: */
       {
-              backgndpid = -1;
+              psh->backgndpid = -1;
 #if JOBS
               jobctl = 0;

trunk/src/kash/histedit.c

@@ -130 +130 @@
                         else
                                 unsetenv("TERM");
-                        shname = arg0;
+                        shname = psh->arg0;
                         if (shname[0] == '-')
                                 shname++;

trunk/src/kash/jobs.c

@@ -94 +94 @@
 static int njobs;                       /* size of array */
 static int jobs_invalid;                /* set in child */
-MKINIT pid_t backgndpid = -1;   /* pid of last background process */
+MKINIT pid_t psh->backgndpid = -1;      /* pid of last background process */
 #if JOBS
 int initialpgrp;                /* pgrp of shell on invocation */
@@ -215 +215 @@
                 setsignal(psh, SIGTTOU, 0);
                 setsignal(psh, SIGTTIN, 0);
-                if (getpgid(0) != rootpid && setpgid(0, rootpid) == -1)
+                if (getpgid(0) != psh->rootpid && sh_setpgid(0, psh->rootpid) == -1)
                         error(psh, "Cannot set process group (%s) at %d",
                             strerror(errno), __LINE__);
-                if (tcsetpgrp(ttyfd, rootpid) == -1)
+                if (tcsetpgrp(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 && setpgid(0, initialpgrp) == -1)
+                if (getpgid(0) != initialpgrp && sh_setpgid(0, initialpgrp) == -1)
                         error(psh, "Cannot set process group (%s) at %d",
                             strerror(errno), __LINE__);
@@ -242 +242 @@
 
 SHELLPROC {
-        backgndpid = -1;
-#if JOBS
-        jobctl = 0;
+        psh->backgndpid = -1;
+#if JOBS
+        psh->jobctl = 0;
 #endif
 }
@@ -511 +511 @@
                 else
                         mode = SHOW_PGID;
-        if (*argptr)
+        if (*psh->argptr)
                 do
-                        showjob(out1, getjob(*argptr,0), mode);
-                while (*++argptr);
+                        showjob(out1, getjob(*psh->argptr,0), mode);
+                while (*++psh->argptr);
         else
                 showjobs(psh, out1, mode);
@@ -608 +608 @@
         nextopt(psh, "");
 
-        if (!*argptr) {
+        if (!*psh->argptr) {
                 /* wait for all jobs */
                 jp = jobtab;
@@ -629 +629 @@
 
         retval = 127;           /* XXXGCC: -Wuninitialized */
-        for (; *argptr; argptr++) {
-                job = getjob(*argptr, 1);
+        for (; *psh->argptr; psh->argptr++) {
+                job = getjob(*psh->argptr, 1);
                 if (!job) {
                         retval = 127;
@@ -666 +666 @@
 
         nextopt(psh, "");
-        jp = getjob(*argptr, 0);
+        jp = getjob(*psh->argptr, 0);
         for (i = 0 ; i < jp->nprocs ; ) {
                 out1fmt(psh, "%ld", (long)jp->ps[i].pid);
@@ -879 +879 @@
         }
         if (mode == FORK_BG)
-                backgndpid = pid;               /* set $! */
+                psh0->backgndpid = pid;         /* set $! */
         if (jp) {
                 struct procstat *ps = &jp->ps[jp->nprocs++];

trunk/src/kash/miscbltin.c

@@ -117 +117 @@
         }
 
-        if (*(ap = argptr) == NULL)
+        if (*(ap = psh->argptr) == NULL)
                 error(psh, "arg count");
 
@@ -230 +230 @@
         INTON;
 
-        if ((ap = *argptr) == NULL) {
+        if ((ap = *psh->argptr) == NULL) {
                 if (symbolic_mode) {
                         char u[4], g[4], o[4];
@@ -386 +386 @@
                 error(psh, "internal error (%c)", what);
 
-        set = *argptr ? 1 : 0;
+        set = *psh->argptr ? 1 : 0;
         if (set) {
-                char *p = *argptr;
-
-                if (all || argptr[1])
+                char *p = *psh->argptr;
+
+                if (all || psh->argptr[1])
                         error(psh, "too many arguments");
                 if (strcmp(p, "unlimited") == 0)

trunk/src/kash/shinstance.h

@@ -36 +36 @@
 #include "options.h"
 
+#include "expand.h"
+#include "exec.h"
 #include "var.h"
 
@@ -70 +72 @@
 };
 
+/* exec.c */
+#define CMDTABLESIZE 31         /* should be prime */
+#define ARB 1                   /* actual size determined at run time */
+
+struct tblentry {
+        struct tblentry *next;  /* next entry in hash chain */
+        union param param;      /* definition of builtin function */
+        short cmdtype;          /* index identifying command */
+        char rehash;            /* if set, cd done since entry created */
+        char cmdname[ARB];      /* name of command */
+};
+
+/* expand.c */
+/*
+ * Structure specifying which parts of the string should be searched
+ * for IFS characters.
+ */
+struct ifsregion {
+        struct ifsregion *next; /* next region in list */
+        int begoff;             /* offset of start of region */
+        int endoff;             /* offset of end of region */
+        int inquotes;           /* search for nul bytes only */
+};
 
 
@@ -91 +116 @@
     struct jmploc      *handler;
     int                 exception;
-    int                 exerrno;
+    int                 exerrno/* = 0 */; /**< Last exec error */
     int volatile        suppressint;
     int volatile        intpending;
@@ -188 +213 @@
     const char         *pathopt;        /**< set by padvance */
 
+    /* exec.c */
+    struct tblentry    *cmdtable[CMDTABLESIZE];
+    int                 builtinloc/* = -1*/;    /**< index in path of %builtin, or -1 */
+
+
     /* eval.h */
     char               *commandname;    /**< currently executing command */
@@ -215 +245 @@
     /* eval.c */
     int                 vforked;
+
+    /* expand.c */
+    char               *expdest;        /**< output of current string */
+    struct nodelist    *argbackq;       /**< list of back quote expressions */
+    struct ifsregion    ifsfirst;       /**< first struct in list of ifs regions */
+    struct ifsregion   *ifslastp;       /**< last struct in list */
+    struct arglist      exparg;         /**< holds expanded arg list */
+    char               *expdir;         /**< Used by expandmeta. */
 
     /* mail.c */
@@ -259 +297 @@
 int sh_sysconf_clk_tck(void);
 
-/* wait */
+/* wait / process */
 #ifdef _MSC_VER
 #   include <process.h>
@@ -284 +322 @@
 pid_t sh_waitpid(shinstance *, pid_t, int *, int);
 void sh__exit(shinstance *, int);
-
-
-#endif
+int sh_execve(shinstance *, const char *, const char * const*, const char * const *);
+
+#endif

trunk/src/kash/trap.c

@@ -401 +401 @@
         for (;;) {
                 for (i = 1 ; ; i++) {
-                        if (gotsig[i - 1])
+                        if (psh->gotsig[i - 1])
                                 break;
                         if (i >= NSIG)
                                 goto done;
                 }
-                gotsig[i - 1] = 0;
-                savestatus=exitstatus;
+                psh->gotsig[i - 1] = 0;
+                savestatus=psh->exitstatus;
                 evalstring(psh, trap[i], 0);
-                exitstatus=savestatus;
+                psh->exitstatus=savestatus;
         }
 done:
-        pendingsigs = 0;
+        psh->pendingsigs = 0;
 }
 

trunk/src/kash/var.c

@@ -681 +681 @@
         }
 
-        while ((name = *argptr++) != NULL) {
+        while ((name = *psh->argptr++) != NULL) {
                 if ((p = strchr(name, '=')) != NULL) {
                         p++;
@@ -708 +708 @@
         if (! in_function(psh))
                 error(psh, "Not in a function");
-        while ((name = *argptr++) != NULL) {
+        while ((name = *psh->argptr++) != NULL) {
                 mklocal(psh, name, 0);
         }
@@ -830 +830 @@
                 flg_var = 1;
 
-        for (ap = argptr; *ap ; ap++) {
+        for (ap = psh->argptr; *ap ; ap++) {
                 if (flg_func)
                         ret |= unsetfunc(psh, *ap);