Changeset 1199 in kBuild for trunk/src/kash

Timestamp:

Oct 6, 2007 10:04:05 PM (17 years ago)

Author:

bird

Message:

moving globals into shinstance...

Location:

trunk/src/kash

Files:

• Makefile.kmk (modified) (2 diffs)
• bltin/bltin.h (modified) (1 diff)
• cd.c (modified) (5 diffs)
• error.c (modified) (1 diff)
• eval.c (modified) (11 diffs)
• exec.c (modified) (19 diffs)
• expand.c (modified) (6 diffs)
• generated/arith.c (modified) (1 diff)
• generated/init.c (modified) (2 diffs)
• histedit.c (modified) (12 diffs)
• input.c (modified) (3 diffs)
• jobs.c (modified) (29 diffs)
• main.c (modified) (2 diffs)
• miscbltin.c (modified) (11 diffs)
• options.c (modified) (1 diff)
• output.c (modified) (16 diffs)
• output.h (modified) (2 diffs)
• parser.c (modified) (9 diffs)
• redir.c (modified) (4 diffs)
• shfile.h (modified) (1 diff)
• shinstance.c (modified) (1 diff)
• shinstance.h (modified) (1 diff)
• show.c (modified) (7 diffs)
• show.h (modified) (1 diff)
• trap.c (modified) (8 diffs)
• var.c (modified) (8 diffs)

trunk/src/kash/Makefile.kmk

@@ -15 +15 @@
 kmk_ash_TEMPLATE = BIN
 kmk_ash_DEFS = lint SHELL SMALL
+kmk_ash_DEFS.debug = DEBUG
 kmk_ash_DEFS.linux = BSD
 kmk_ash_DEFS.solaris = BSD
@@ -42 +43 @@
         show.c \
         syntax.c \
+        output.c \
         \
-        output.c \
         exec.c \
         expand.c \

trunk/src/kash/bltin/bltin.h

@@ -55 +55 @@
 #define printf out1fmt
 #define putc(c, file)   outc(c, file)
-#define putchar(c)      out1c(c)
+#define putchar(c)      out1c(psh, c)
 #define FILE struct output
 #define fprintf outfmt

trunk/src/kash/cd.c

@@ -161 +161 @@
         int badstat;
 
-        TRACE(("docd(\"%s\", %d) called\n", dest, print));
+        TRACE((psh, "docd(\"%s\", %d) called\n", dest, print));
 
         /*
@@ -410 +410 @@
                 INTOFF;
                 if (pipe(pip) < 0)
-                        error("Pipe call failed");
+                        error(psh, "Pipe call failed");
                 jp = makejob((union node *)NULL, 1);
                 if (forkshell(jp, (union node *)NULL, FORK_NOJOB) == 0) {
@@ -420 +420 @@
                         }
                         (void) execl("/bin/pwd", "pwd", (char *)0);
-                        error("Cannot exec /bin/pwd");
+                        error(psh, "Cannot exec /bin/pwd");
                 }
                 (void) close(pip[1]);
@@ -434 +434 @@
                 status = waitforjob(jp);
                 if (status != 0)
-                        error((char *)0);
+                        error(psh, (char *)0);
                 if (i < 0 || p == pwd || p[-1] != '\n') {
                         if (noerror) {
@@ -440 +440 @@
                                 return;
                         }
-                        error("pwd command failed");
+                        error(psh, "pwd command failed");
                 }
                 p[-1] = '\0';

trunk/src/kash/error.c

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

trunk/src/kash/eval.c

@@ -226 +226 @@
 {
         if (n == NULL) {
-                TRACE(("evaltree(NULL) called\n"));
+                TRACE((psh, "evaltree(NULL) called\n"));
                 psh->exitstatus = 0;
                 goto out;
@@ -233 +233 @@
         psh->displayhist = 1;   /* show history substitutions done with fc */
 #endif
-        TRACE(("pid %d, evaltree(%p: %d, %d) called\n",
-            getpid(), n, n->type, flags));
+        TRACE((psh, "pid %d, evaltree(%p: %d, %d) called\n",
+               getpid(), n, n->type, flags));
         switch (n->type) {
         case NSEMI:
@@ -500 +500 @@
         int pip[2];
 
-        TRACE(("evalpipe(0x%lx) called\n", (long)n));
+        TRACE((psh, "evalpipe(0x%lx) called\n", (long)n));
         pipelen = 0;
         for (lp = n->npipe.cmdlist ; lp ; lp = lp->next)
@@ -540 +540 @@
         if (n->npipe.backgnd == 0) {
                 psh->exitstatus = waitforjob(psh, jp);
-                TRACE(("evalpipe:  job done exit status %d\n", psh->exitstatus));
+                TRACE((psh, "evalpipe:  job done exit status %d\n", psh->exitstatus));
         }
         INTON;
@@ -605 +605 @@
 out:
         popstackmark(psh, &smark);
-        TRACE(("evalbackcmd done: fd=%d buf=0x%x nleft=%d jp=0x%x\n",
+        TRACE((psh, "evalbackcmd done: fd=%d buf=0x%x nleft=%d jp=0x%x\n",
                 result->fd, result->buf, result->nleft, result->jp));
 }
@@ -716 +716 @@
         psh->vforked = 0;
         /* First expand the arguments. */
-        TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
+        TRACE((psh, "evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
         setstackmark(psh, &smark);
         psh->exitstatus = 0;
@@ -760 +760 @@
 
         for (sp = arglist.list ; sp ; sp = sp->next) {
-                TRACE(("evalcommand arg: %s\n", sp->text));
+                TRACE((psh, "evalcommand arg: %s\n", sp->text));
                 *argv++ = sp->text;
         }
@@ -864 +864 @@
                         switch (pid = vfork()) {
                         case -1:
-                                TRACE(("Vfork failed, errno=%d\n", errno));
+                                TRACE((psh, "Vfork failed, errno=%d\n", errno));
                                 INTON;
                                 error(psh, "Cannot vfork");
@@ -932 +932 @@
         case CMDFUNCTION:
 #ifdef DEBUG
-                trputs("Shell function:  ");  trargs(argv);
+                trputs(psh, "Shell function:  ");  trargs(psh, argv);
 #endif
                 redirect(psh, cmd->ncmd.redirect, REDIR_PUSH);
@@ -985 +985 @@
         case CMDSPLBLTIN:
 #ifdef DEBUG
-                trputs("builtin command:  ");  trargs(argv);
+                trputs(psh, "builtin command:  ");  trargs(psh, argv);
 #endif
                 mode = (cmdentry.u.bltin == execcmd) ? 0 : REDIR_PUSH;
@@ -1069 +1069 @@
         default:
 #ifdef DEBUG
-                trputs("normal command:  ");  trargs(argv);
+                trputs(psh, "normal command:  ");  trargs(psh, argv);
 #endif
                 clearredir(psh, psh->vforked);

trunk/src/kash/exec.c

@@ -144 +144 @@
         const int has_ext = 1;
 #endif
-        TRACE(("shellexec: argv[0]=%s idx=%d\n", argv[0], idx));
+        TRACE((psh, "shellexec: argv[0]=%s idx=%d\n", argv[0], idx));
         if (strchr(argv[0], '/') != NULL) {
                 cmdname = stalloc(psh, strlen(argv[0]) + 5);
                 strcpy(cmdname, argv[0]);
                 tryexec(cmdname, argv, envp, vforked, has_ext);
-                TRACE(("shellexec: cmdname=%s\n", cmdname));
+                TRACE((psh, "shellexec: cmdname=%s\n", cmdname));
                 stunalloc(psh, cmdname);
                 e = errno;
@@ -176 +176 @@
                 break;
         }
-        TRACE(("shellexec failed for '%s', errno %d, vforked %d, suppressint %d\n",
+        TRACE((psh, "shellexec failed for '%s', errno %d, vforked %d, suppressint %d\n",
                 argv[0], e, vforked, suppressint ));
-        exerror(EXEXEC, "%s: %s", argv[0], errmsg(e, E_EXEC));
+        exerror(psh, EXEXEC, "%s: %s", argv[0], errmsg(psh, e, E_EXEC));
         /* NOTREACHED */
 }
@@ -216 +216 @@
                          * with a normal fork(2).
                          */
-                        exraise(EXSHELLPROC);
+                        exraise(psh, EXSHELLPROC);
                 }
                 initshellproc();
@@ -230 +230 @@
 #endif
                 setparam(argv + 1);
-                exraise(EXSHELLPROC);
+                exraise(psh, EXSHELLPROC);
         }
         errno = e;
@@ -274 +274 @@
                         break;
                 if (ap == &newargs[NEWARGS])
-bad:              error("Bad #! line");
+bad:              error(psh, "Bad #! line");
                 STARTSTACKSTR(psh, outp);
                 do {
@@ -287 +287 @@
                 for (;;) {
                         if (equal(p, "sh") || equal(p, "ash")) {
-                                TRACE(("hash bang self\n"));
+                                TRACE((psh, "hash bang self\n"));
                                 return;
                         }
@@ -301 +301 @@
         i = (char *)ap - (char *)newargs;               /* size in bytes */
         if (i == 0)
-                error("Bad #! line");
+                error(psh, "Bad #! line");
         for (ap2 = argv ; *ap2++ != NULL ; );
         new = ckmalloc(i + ((char *)ap2 - (char *)argv));
@@ -309 +309 @@
         ap = argv;
         while (*ap2++ = *ap++);
-        TRACE(("hash bang '%s'\n", new[0]));
+        TRACE((psh, "hash bang '%s'\n", new[0]));
         shellexec(new, envp, pathval(), 0, 0);
         /* NOTREACHED */
@@ -464 +464 @@
                                 printentry(cmdp, verbose);
                         }
-                        output_flushall();
+                        output_flushall(psh);
                 }
                 argptr++;
@@ -487 +487 @@
                         stunalloc(psh, name);
                 } while (--idx >= 0);
-                out1str(name);
+                out1str(psh, name);
                 break;
         case CMDSPLBLTIN:
-                out1fmt("special builtin %s", cmdp->cmdname);
+                out1fmt(psh, "special builtin %s", cmdp->cmdname);
                 break;
         case CMDBUILTIN:
-                out1fmt("builtin %s", cmdp->cmdname);
+                out1fmt(psh, "builtin %s", cmdp->cmdname);
                 break;
         case CMDFUNCTION:
-                out1fmt("function %s", cmdp->cmdname);
+                out1fmt(psh, "function %s", cmdp->cmdname);
                 if (verbose) {
                         struct procstat ps;
@@ -502 +502 @@
                         commandtext(&ps, cmdp->param.func);
                         INTON;
-                        out1str("() { ");
-                        out1str(ps.cmd);
-                        out1str("; }");
+                        out1str(psh, "() { ");
+                        out1str(psh, ps.cmd);
+                        out1str(psh, "; }");
                 }
                 break;
         default:
-                error("internal error: %s cmdtype %d", cmdp->cmdname, cmdp->cmdtype);
+                error(psh, "internal error: %s cmdtype %d", cmdp->cmdname, cmdp->cmdtype);
         }
         if (cmdp->rehash)
-                out1c('*');
-        out1c('\n');
+                out1c(psh, '*');
+        out1c(psh, '\n');
 }
 
@@ -641 +641 @@
                         if (idx < prev)
                                 goto loop;
-                        TRACE(("searchexec \"%s\": no change\n", name));
+                        TRACE((psh, "searchexec \"%s\": no change\n", name));
                         goto success;
                 }
@@ -668 +668 @@
                         if ((cmdp = cmdlookup(name, 0)) == NULL ||
                             cmdp->cmdtype != CMDFUNCTION)
-                                error("%s not defined in %s", name, fullname);
+                                error(psh, "%s not defined in %s", name, fullname);
                         stunalloc(psh, fullname);
                         goto success;
@@ -686 +686 @@
                 }
 #endif
-                TRACE(("searchexec \"%s\" returns \"%s\"\n", name, fullname));
+                TRACE((psh, "searchexec \"%s\" returns \"%s\"\n", name, fullname));
                 INTOFF;
                 if (act & DO_ALTPATH) {
@@ -703 +703 @@
                 delete_cmd_entry();
         if (act & DO_ERR)
-                outfmt(out2, "%s: %s\n", name, errmsg(e, E_EXEC));
+                outfmt(out2, "%s: %s\n", name, errmsg(psh, e, E_EXEC));
         entry->cmdtype = CMDUNKNOWN;
         return;
@@ -1094 +1094 @@
 
         if (p_flag && (v_flag || V_flag))
-                error("cannot specify -p with -v or -V");
+                error(psh, "cannot specify -p with -v or -V");
 
         while ((arg = *argptr++)) {
                 if (!v_flag)
-                        out1str(arg);
+                        out1str(psh, arg);
                 /* First look at the keywords */
                 for (pp = parsekwd; *pp; pp++)
@@ -1108 +1108 @@
                                 err = 1;
                         else
-                                out1str(" is a shell keyword\n");
+                                out1str(psh, " is a shell keyword\n");
                         continue;
                 }
 
                 /* Then look at the aliases */
-                if ((ap = lookupalias(arg, 1)) != NULL) {
+                if ((ap = lookupalias(psh, arg, 1)) != NULL) {
                         if (!v_flag)
-                                out1fmt(" is an alias for \n");
-                        out1fmt("%s\n", ap->val);
+                                out1fmt(psh, " is an alias for \n");
+                        out1fmt(psh, "%s\n", ap->val);
                         continue;
                 }
@@ -1140 +1140 @@
                                 } while (--j >= 0);
                                 if (!v_flag)
-                                        out1fmt(" is%s ",
+                                        out1fmt(psh, " is%s ",
                                             cmdp ? " a tracked alias for" : "");
-                                out1fmt("%s\n", name);
+                                out1fmt(psh, "%s\n", name);
                         } else {
                                 if (access(arg, X_OK) == 0) {
                                         if (!v_flag)
-                                                out1fmt(" is ");
-                                        out1fmt("%s\n", arg);
+                                                out1fmt(psh, " is ");
+                                        out1fmt(psh, "%s\n", arg);
                                 } else {
                                         if (!v_flag)
-                                                out1fmt(": %s\n",
+                                                out1fmt(psh, ": %s\n",
                                                     strerror(errno));
                                         else
@@ -1160 +1160 @@
                 case CMDFUNCTION:
                         if (!v_flag)
-                                out1str(" is a shell function\n");
+                                out1str(psh, " is a shell function\n");
                         else
-                                out1fmt("%s\n", arg);
+                                out1fmt(psh, "%s\n", arg);
                         break;
 
                 case CMDBUILTIN:
                         if (!v_flag)
-                                out1str(" is a shell builtin\n");
+                                out1str(psh, " is a shell builtin\n");
                         else
-                                out1fmt("%s\n", arg);
+                                out1fmt(psh, "%s\n", arg);
                         break;
 
                 case CMDSPLBLTIN:
                         if (!v_flag)
-                                out1str(" is a special shell builtin\n");
+                                out1str(psh, " is a special shell builtin\n");
                         else
-                                out1fmt("%s\n", arg);
+                                out1fmt(psh, "%s\n", arg);
                         break;
 
                 default:
                         if (!v_flag)
-                                out1str(": not found\n");
+                                out1str(psh, ": not found\n");
                         err = 127;
                         break;

trunk/src/kash/expand.c

@@ -385 +385 @@
                 --p;
         if (*p != CTLARI)
-                error("missing CTLARI (shouldn't happen)");
+                error(psh, "missing CTLARI (shouldn't happen)");
         if (p > start && *(p-1) == CTLESC)
                 for (p = start; *p != CTLARI; p++)
@@ -453 +453 @@
                                 break;
                         while ((i = read(in.fd, buf, sizeof buf)) < 0 && errno == EINTR);
-                        TRACE(("expbackq: read returns %d\n", i));
+                        TRACE((psh, "expbackq: read returns %d\n", i));
                         if (i <= 0)
                                 break;
@@ -480 +480 @@
         if (quoted == 0)
                 recordregion(startloc, dest - stackblock(psh), 0);
-        TRACE(("evalbackq: size=%d: \"%.*s\"\n",
+        TRACE((psh, "evalbackq: size=%d: \"%.*s\"\n",
                 (dest - stackblock(psh)) - startloc,
                 (dest - stackblock(psh)) - startloc,
@@ -523 +523 @@
                 if (*p != CTLENDVAR) {
                         outfmt(&errout, "%s\n", startp);
-                        error((char *)NULL);
-                }
-                error("%.*s: parameter %snot set", p - str - 1,
+                        error(psh, (char *)NULL);
+                }
+                error(psh, "%.*s: parameter %snot set", p - str - 1,
                       str, (varflags & VSNUL) ? "null or "
                                               : nullstr);
@@ -658 +658 @@
                 case VSTRIMRIGHTMAX:
                 case VSLENGTH:
-                        error("%.*s: parameter not set", p - var - 1, var);
+                        error(psh, "%.*s: parameter not set", p - var - 1, var);
                         /* NOTREACHED */
                 }
@@ -1556 +1556 @@
         int i;
 
-        out1fmt("%d", argc - 1);
-        out1c('\0');
+        out1fmt(psh, "%d", argc - 1);
+        out1c(psh, '\0');
         for (i = 1, len = 0; i < argc; i++)
                 len += strlen(argv[i]);
-        out1fmt("%zd", len);
-        out1c('\0');
+        out1fmt(psh, "%zd", len);
+        out1c(psh, '\0');
         for (i = 1; i < argc; i++) {
-                out1str(argv[i]);
-                out1c('\0');
+                out1str(psh, argv[i]);
+                out1c(psh, '\0');
         }
         return (0);

trunk/src/kash/generated/arith.c

@@ -346 +346 @@
         i = arith(p);
 
-        out1fmt("%ld\n", i);
+        out1fmt(psh, "%ld\n", i);
         return (! i);
 }

trunk/src/kash/generated/init.c

@@ -118 +118 @@
 
 
-extern void rmaliases(void);
+extern void rmaliases(struct shinstance *);
 
 extern int loopnest;            /* current loop nesting level */
@@ -256 +256 @@
       /* from alias.c: */
       {
-              rmaliases();
+              rmaliases(psh);
       }
 

trunk/src/kash/histedit.c

@@ -105 +105 @@
                                 sethistsize(histsizeval());
                         else
-                                out2str("sh: can't initialize history\n");
+                                out2str(psh, "sh: can't initialize history\n");
                 }
                 if (editing && !el && isatty(0)) { /* && isatty(2) ??? */
@@ -144 +144 @@
                         } else {
 bad:
-                                out2str("sh: can't initialize editing\n");
+                                out2str(psh, "sh: can't initialize editing\n");
                         }
                         INTON;
@@ -207 +207 @@
 {
         if (argc != 2) {
-                out2str("usage: inputrc file\n");
+                out2str(psh, "usage: inputrc file\n");
                 return 1;
         }
         if (el != NULL) {
                 if (el_source(el, argv[1])) {
-                        out2str("inputrc: failed\n");
+                        out2str(psh, "inputrc: failed\n");
                         return 1;
                 } else
                         return 0;
         } else {
-                out2str("sh: inputrc ignored, not editing\n");
+                out2str(psh, "sh: inputrc ignored, not editing\n");
                 return 1;
         }
@@ -259 +259 @@
 
         if (hist == NULL)
-                error("history not active");
+                error(psh, "history not active");
 
         if (argc == 1)
-                error("missing history argument");
+                error(psh, "missing history argument");
 
         optreset = 1; optind = 1; /* initialize getopt */
@@ -284 +284 @@
                         break;
                 case ':':
-                        error("option -%c expects argument", optopt);
+                        error(psh, "option -%c expects argument", optopt);
                         /* NOTREACHED */
                 case '?':
                 default:
-                        error("unknown option: -%c", optopt);
+                        error(psh, "unknown option: -%c", optopt);
                         /* NOTREACHED */
                 }
@@ -315 +315 @@
                         active = 0;
                         displayhist = 0;
-                        error("called recursively too many times");
+                        error(psh, "called recursively too many times");
                 }
                 /*
@@ -358 +358 @@
                 break;
         default:
-                error("too many args");
+                error(psh, "too many args");
                 /* NOTREACHED */
         }
@@ -387 +387 @@
                 snprintf(editfile, sizeof(editfile), "%s_shXXXXXX", _PATH_TMP);
                 if ((fd = mkstemp(editfile)) < 0)
-                        error("can't create temporary file %s", editfile);
+                        error(psh, "can't create temporary file %s", editfile);
                 if ((efp = fdopen(fd, "w")) == NULL) {
                         close(fd);
-                        error("can't allocate stdio buffer for temp");
+                        error(psh, "can't allocate stdio buffer for temp");
                 }
         }
@@ -407 +407 @@
                 if (lflg) {
                         if (!nflg)
-                                out1fmt("%5d ", he.num);
-                        out1str(he.str);
+                                out1fmt(psh, "%5d ", he.num);
+                        out1str(psh, he.str);
                 } else {
                         const char *s = pat ?
@@ -415 +415 @@
                         if (sflg) {
                                 if (displayhist) {
-                                        out2str(s);
+                                        out2str(psh, s);
                                 }
 
@@ -523 +523 @@
                 }
                 if (retval == -1)
-                        error("history number %s not found (internal error)",
+                        error(psh, "history number %s not found (internal error)",
                                str);
         } else {
@@ -531 +531 @@
                 retval = history(hist, &he, H_PREV_STR, str);
                 if (retval == -1)
-                        error("history pattern not found: %s", str);
+                        error(psh, "history pattern not found: %s", str);
         }
         return (he.num);

trunk/src/kash/input.c

@@ -221 +221 @@
                                         flags &=~ O_NONBLOCK;
                                         if (fcntl(0, F_SETFL, flags) >= 0) {
-                                                out2str("sh: turning off NDELAY mode\n");
+                                                out2str(psh, "sh: turning off NDELAY mode\n");
                                                 goto retry;
                                         }
@@ -317 +317 @@
 
         if (vflag(psh)) {
-                out2str(parsenextc);
+                out2str(psh, parsenextc);
                 flushout(out2);
         }
@@ -397 +397 @@
         INTOFF;
         if ((fd = open(fname, O_RDONLY)) < 0)
-                error("Can't open %s", fname);
+                error(psh, "Can't open %s", fname);
         if (fd < 10) {
                 fd2 = copyfd(fd, 10);
                 close(fd);
                 if (fd2 < 0)
-                        error("Out of file descriptors");
+                        error(psh, "Out of file descriptors");
                 fd = fd2;
         }

trunk/src/kash/jobs.c

@@ -186 +186 @@
                 }
 #else
-                out2str("sh: Need FIOCLEX or FD_CLOEXEC to support job control");
+                out2str(psh, "sh: Need FIOCLEX or FD_CLOEXEC to support job control");
                 goto out;
 #endif
@@ -192 +192 @@
                         if ((initialpgrp = tcgetpgrp(ttyfd)) < 0) {
 out:
-                                out2str("sh: can't access tty; job control turned off\n");
+                                out2str(psh, "sh: can't access tty; job control turned off\n");
                                 mflag(psh) = 0;
                                 return;
@@ -207 +207 @@
                 if (ioctl(ttyfd, TIOCGETD, (char *)&ldisc) < 0
                     || ldisc != NTTYDISC) {
-                        out2str("sh: need new tty driver to run job control; job control turned off\n");
+                        out2str(psh, "sh: need new tty driver to run job control; job control turned off\n");
                         mflag(psh) = 0;
                         return;
@@ -216 +216 @@
                 setsignal(SIGTTIN, 0);
                 if (getpgid(0) != rootpid && setpgid(0, rootpid) == -1)
-                        error("Cannot set process group (%s) at %d",
+                        error(psh, "Cannot set process group (%s) at %d",
                             strerror(errno), __LINE__);
                 if (tcsetpgrp(ttyfd, rootpid) == -1)
-                        error("Cannot set tty process group (%s) at %d",
+                        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)
-                        error("Cannot set process group (%s) at %d",
+                        error(psh, "Cannot set process group (%s) at %d",
                             strerror(errno), __LINE__);
                 if (tcsetpgrp(ttyfd, initialpgrp) == -1)
-                        error("Cannot set tty process group (%s) at %d",
+                        error(psh, "Cannot set tty process group (%s) at %d",
                             strerror(errno), __LINE__);
                 close(ttyfd);
@@ -263 +263 @@
         jp = getjob(*argptr, 0);
         if (jp->jobctl == 0)
-                error("job not created under job control");
-        out1fmt("%s", jp->ps[0].cmd);
+                error(psh, "job not created under job control");
+        out1fmt(psh, "%s", jp->ps[0].cmd);
         for (i = 1; i < jp->nprocs; i++)
-                out1fmt(" | %s", jp->ps[i].cmd );
-        out1c('\n');
-        output_flushall();
+                out1fmt(psh, " | %s", jp->ps[i].cmd );
+        out1c(psh, '\n');
+        output_flushall(psh);
 
         for (i = 0; i < jp->nprocs; i++)
@@ -275 +275 @@
 
         if (i >= jp->nprocs) {
-                error("Cannot set tty process group (%s) at %d",
+                error(psh, "Cannot set tty process group (%s) at %d",
                     strerror(errno), __LINE__);
         }
@@ -340 +340 @@
         nextopt("");
         do {
-                jp = getjob(*argptr, 0);
+                jp = getjob(psh, *psh->argptr, 0);
                 if (jp->jobctl == 0)
-                        error("job not created under job control");
+                        error(psh, "job not created under job control");
                 set_curjob(jp, 1);
-                out1fmt("[%ld] %s", (long)(jp - jobtab + 1), jp->ps[0].cmd);
+                out1fmt(psh, "[%ld] %s", (long)(jp - jobtab + 1), jp->ps[0].cmd);
                 for (i = 1; i < jp->nprocs; i++)
-                        out1fmt(" | %s", jp->ps[i].cmd );
-                out1c('\n');
-                output_flushall();
+                        out1fmt(psh, " | %s", jp->ps[i].cmd );
+                out1c(psh, '\n');
+                output_flushall(psh);
                 restartjob(jp);
-        } while (*argptr && *++argptr);
+        } while (*psh->argptr && *++psh->argptr);
         return 0;
 }
@@ -368 +368 @@
                         break;
         if (i >= jp->nprocs)
-                error("Cannot continue job (%s)", strerror(errno));
+                error(psh, "Cannot continue job (%s)", strerror(errno));
         for (ps = jp->ps, i = jp->nprocs ; --i >= 0 ; ps++) {
                 if (WIFSTOPPED(ps->status)) {
@@ -425 +425 @@
         if (mode & SHOW_SIGNALLED && !(mode & SHOW_ISSIG)) {
                 if (jp->state == JOBDONE && !(mode & SHOW_NO_FREE)) {
-                        TRACE(("showjob: freeing job %d\n", jp - jobtab + 1));
+                        TRACE((psh, "showjob: freeing job %d\n", jp - jobtab + 1));
                         freejob(jp);
                 }
@@ -538 +538 @@
         int silent = 0, gotpid;
 
-        TRACE(("showjobs(%x) called\n", mode));
+        TRACE((psh, "showjobs(%x) called\n", mode));
 
         /* If not even one one job changed, there is nothing to do */
@@ -551 +551 @@
         if (mflag(psh) && gotpid != -1 && tcgetpgrp(ttyfd) != getpid()) {
                 if (tcsetpgrp(ttyfd, getpid()) == -1)
-                        error("Cannot set tty process group (%s) at %d",
+                        error(psh, "Cannot set tty process group (%s) at %d",
                             strerror(errno), __LINE__);
-                TRACE(("repaired tty process group\n"));
+                TRACE((psh, "repaired tty process group\n"));
                 silent = 1;
         }
@@ -668 +668 @@
         jp = getjob(*argptr, 0);
         for (i = 0 ; i < jp->nprocs ; ) {
-                out1fmt("%ld", (long)jp->ps[i].pid);
-                out1c(++i < jp->nprocs ? ' ' : '\n');
+                out1fmt(psh, "%ld", (long)jp->ps[i].pid);
+                out1c(psh, ++i < jp->nprocs ? ' ' : '\n');
         }
         return 0;
@@ -762 +762 @@
         }
         if (!noerror)
-                error(err_msg, name);
+                error(psh, err_msg, name);
         return 0;
 }
@@ -824 +824 @@
         }
         INTON;
-        TRACE(("makejob(0x%lx, %d) returns %%%d\n", (long)node, nprocs,
-            jp - jobtab + 1));
+        TRACE((psh, "makejob(0x%lx, %d) returns %%%d\n", (long)node, nprocs,
+               jp - jobtab + 1));
         return jp;
 }
@@ -850 +850 @@
         int pid;
 
-        TRACE(("forkshell(%%%d, %p, %d) called\n", jp - jobtab, n, mode));
+        TRACE((psh, "forkshell(%%%d, %p, %d) called\n", jp - jobtab, n, mode));
         switch ((pid = fork())) {
         case -1:
-                TRACE(("Fork failed, errno=%d\n", errno));
+                TRACE((psh, "Fork failed, errno=%d\n", errno));
                 INTON;
-                error("Cannot fork");
+                error(psh, "Cannot fork");
                 break;
         case 0:
@@ -888 +888 @@
                         commandtext(ps, n);
         }
-        TRACE(("In parent shell:  child = %d\n", pid));
+        TRACE((psh, "In parent shell:  child = %d\n", pid));
         return pid;
 }
@@ -901 +901 @@
 
         wasroot = rootshell;
-        TRACE(("Child shell %d\n", getpid()));
+        TRACE((psh, "Child shell %d\n", getpid()));
         if (!vforked)
                 rootshell = 0;
@@ -919 +919 @@
                 if (mode == FORK_FG) {
                         if (tcsetpgrp(ttyfd, pgrp) == -1)
-                                error("Cannot set tty process group (%s) at %d",
+                                error(psh, "Cannot set tty process group (%s) at %d",
                                     strerror(errno), __LINE__);
                 }
@@ -931 +931 @@
                         close(0);
                         if (open(devnull, O_RDONLY) != 0)
-                                error(nullerr, devnull);
+                                error(psh, nullerr, devnull);
                 }
         }
@@ -942 +942 @@
                         close(0);
                         if (open(devnull, O_RDONLY) != 0)
-                                error(nullerr, devnull);
+                                error(psh, nullerr, devnull);
                 }
         }
@@ -985 +985 @@
 
         INTOFF;
-        TRACE(("waitforjob(%%%d) called\n", jp - jobtab + 1));
+        TRACE((psh, "waitforjob(%%%d) called\n", jp - jobtab + 1));
         while (jp->state == JOBRUNNING) {
                 dowait(1, jp);
@@ -992 +992 @@
         if (jp->jobctl) {
                 if (tcsetpgrp(ttyfd, mypgrp) == -1)
-                        error("Cannot set tty process group (%s) at %d",
+                        error(psh, "Cannot set tty process group (%s) at %d",
                             strerror(errno), __LINE__);
         }
@@ -1008 +1008 @@
         else
                 st = WTERMSIG(status) + 128;
-        TRACE(("waitforjob: job %d, nproc %d, status %x, st %x\n",
+        TRACE((psh, "waitforjob: job %d, nproc %d, status %x, st %x\n",
                 jp - jobtab + 1, jp->nprocs, status, st ));
 #if JOBS
@@ -1048 +1048 @@
         extern volatile char gotsig[];
 
-        TRACE(("dowait(%d) called\n", block));
+        TRACE((psh, "dowait(%d) called\n", block));
         do {
                 pid = waitproc(block, job, &status);
-                TRACE(("wait returns pid %d, status %d\n", pid, status));
+                TRACE((psh, "wait returns pid %d, status %d\n", pid, status));
         } while (pid == -1 && errno == EINTR && gotsig[SIGINT - 1] == 0);
         if (pid <= 0)
@@ -1065 +1065 @@
                                         continue;
                                 if (sp->pid == pid) {
-                                        TRACE(("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 - jobtab + 1, pid, sp->status, status));
                                         sp->status = status;
                                         thisjob = jp;
@@ -1077 +1077 @@
                                 int state = done ? JOBDONE : JOBSTOPPED;
                                 if (jp->state != state) {
-                                        TRACE(("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 - jobtab + 1, jp->state, state));
                                         jp->state = state;
 #if JOBS
@@ -1097 +1097 @@
                         showjob(out2, thisjob, mode);
                 else {
-                        TRACE(("Not printing status, rootshell=%d, job=%p\n",
+                        TRACE((psh, "Not printing status, rootshell=%d, job=%p\n",
                                 rootshell, job));
                         thisjob->changed = 1;
@@ -1196 +1196 @@
                         continue;
                 if (jp->state == JOBSTOPPED) {
-                        out2str("You have stopped jobs.\n");
+                        out2str(psh, "You have stopped jobs.\n");
                         job_warning = 2;
                         return (1);
@@ -1233 +1233 @@
         } else
                 *cmdnextc = '\0';
-        TRACE(("commandtext: ps->cmd %x, end %x, left %d\n\t\"%s\"\n",
+        TRACE((psh, "commandtext: ps->cmd %x, end %x, left %d\n\t\"%s\"\n",
                 ps->cmd, cmdnextc, cmdnleft, ps->cmd));
 }

trunk/src/kash/main.c

@@ -207 +207 @@
 #endif
         opentrace(psh);
-        trputs("Shell args:  ");  trargs(argv);
+        trputs(psh, "Shell args:  ");  trargs(psh, argv);
 #endif
 
@@ -271 +271 @@
         int numeof = 0;
 
-        TRACE(("cmdloop(%d) called\n", top));
+        TRACE((psh, "cmdloop(%d) called\n", top));
         setstackmark(psh, &smark);
         for (;;) {

trunk/src/kash/miscbltin.c

@@ -113 +113 @@
 
         if (prompt && isatty(0)) {
-                out2str(prompt);
-                output_flushall();
+                out2str(psh, prompt);
+                output_flushall(psh);
         }
 
         if (*(ap = argptr) == NULL)
-                error("arg count");
+                error(psh, "arg count");
 
         if ((ifs = bltinlookup("IFS", 1)) == NULL)
@@ -261 +261 @@
                         o[i] = '\0';
 
-                        out1fmt("u=%s,g=%s,o=%s\n", u, g, o);
+                        out1fmt(psh, "u=%s,g=%s,o=%s\n", u, g, o);
                 } else {
-                        out1fmt("%.4o\n", mask);
+                        out1fmt(psh, "%.4o\n", mask);
                 }
         } else {
@@ -270 +270 @@
                         do {
                                 if (*ap >= '8' || *ap < '0')
-                                        error("Illegal number: %s", argv[1]);
+                                        error(psh, "Illegal number: %s", argv[1]);
                                 mask = (mask << 3) + (*ap - '0');
                         } while (*++ap != '\0');
@@ -288 +288 @@
                         INTON;
                         if (!set)
-                                error("Illegal mode: %s", ap);
+                                error(psh, "Illegal mode: %s", ap);
 
                         umask(~mask & 0777);
@@ -384 +384 @@
                 ;
         if (!l->name)
-                error("internal error (%c)", what);
+                error(psh, "internal error (%c)", what);
 
         set = *argptr ? 1 : 0;
@@ -391 +391 @@
 
                 if (all || argptr[1])
-                        error("too many arguments");
+                        error(psh, "too many arguments");
                 if (strcmp(p, "unlimited") == 0)
                         val = RLIM_INFINITY;
@@ -404 +404 @@
                         }
                         if (c)
-                                error("bad number");
+                                error(psh, "bad number");
                         val *= l->factor;
                 }
@@ -416 +416 @@
                                 val = limit.rlim_max;
 
-                        out1fmt("%-20s ", l->name);
+                        out1fmt(psh, "%-20s ", l->name);
                         if (val == RLIM_INFINITY)
                                 out1fmt("unlimited\n");
@@ -423 +423 @@
                                 val /= l->factor;
 #ifdef BSD4_4
-                                out1fmt("%lld\n", (long long) val);
+                                out1fmt(psh, "%lld\n", (long long) val);
 #else
-                                out1fmt("%ld\n", (long) val);
+                                out1fmt(psh, "%ld\n", (long) val);
 #endif
                         }
@@ -439 +439 @@
                         limit.rlim_cur = val;
                 if (setrlimit(l->cmd, &limit) < 0)
-                        error("error setting limit (%s)", strerror(errno));
+                        error(psh, "error setting limit (%s)", strerror(errno));
         } else {
                 if (how & SOFT)
@@ -447 +447 @@
 
                 if (val == RLIM_INFINITY)
-                        out1fmt("unlimited\n");
+                        out1fmt(psh, "unlimited\n");
                 else
                 {
                         val /= l->factor;
 #ifdef BSD4_4
-                        out1fmt("%lld\n", (long long) val);
+                        out1fmt(psh, "%lld\n", (long long) val);
 #else
-                        out1fmt("%ld\n", (long) val);
+                        out1fmt(psh, "%ld\n", (long) val);
 #endif
                 }

trunk/src/kash/options.c

@@ -213 +213 @@
 #ifdef DEBUG
         if (&psh->optlist[i].val == &debug(psh))
-                opentrace();
+                opentrace(psh);
 #endif
 }

trunk/src/kash/output.c

@@ -71 +71 @@
 #include "error.h"
 
-
-#define OUTBUFSIZ BUFSIZ
+#include "shinstance.h"
+
+//#define OUTBUFSIZ BUFSIZ
 #define BLOCK_OUT -2            /* output to a fixed block of memory */
-#define MEM_OUT -3              /* output to dynamically allocated memory */
+//#define MEM_OUT -3            /* output to dynamically allocated memory */
 #define OUTPUT_ERR 01           /* error occurred on output */
 
 
-struct output output = {NULL, 0, NULL, OUTBUFSIZ, 1, 0};
-struct output errout = {NULL, 0, NULL, 100, 2, 0};
-struct output memout = {NULL, 0, NULL, 0, MEM_OUT, 0};
-struct output *out1 = &output;
-struct output *out2 = &errout;
+//struct output output = {NULL, 0, NULL, OUTBUFSIZ, 1, 0};
+//struct output errout = {NULL, 0, NULL, 100, 2, 0};
+//struct output memout = {NULL, 0, NULL, 0, MEM_OUT, 0};
+//struct output *out1 = &output;
+//struct output *out2 = &errout;
 
 
@@ -92 +93 @@
 
 RESET {
-        out1 = &output;
-        out2 = &errout;
-        if (memout.buf != NULL) {
-                ckfree(memout.buf);
-                memout.buf = NULL;
+        psh->out1 = &psh->output;
+        psh->out2 = &psh->errout;
+        if (psh->memout.buf != NULL) {
+                ckfree(psh->memout.buf);
+                psh->memout.buf = NULL;
         }
 }
@@ -120 +121 @@
 
 void
-out1str(const char *p)
-{
-        outstr(p, out1);
-}
-
-
-void
-out2str(const char *p)
-{
-        outstr(p, out2);
+out1str(shinstance *psh, const char *p)
+{
+        outstr(p, psh->out1);
+}
+
+
+void
+out2str(shinstance *psh, const char *p)
+{
+        outstr(p, psh->out2);
 }
 
@@ -138 +139 @@
         while (*p)
                 outc(*p++, file);
-        if (file == out2)
+        if (file == file->psh->out2)
                 flushout(file);
 }
@@ -150 +151 @@
 {
         int offset;
+        shinstance *psh = dest->psh;
 
         if (dest->fd == BLOCK_OUT) {
@@ -177 +179 @@
 
 void
-output_flushall(void)
-{
-        flushout(&output);
-        flushout(&errout);
+output_flushall(shinstance *psh)
+{
+        flushout(&psh->output);
+        flushout(&psh->errout);
 }
 
@@ -190 +192 @@
         if (dest->buf == NULL || dest->nextc == dest->buf || dest->fd < 0)
                 return;
-        if (xwrite(psh, dest->fd, dest->buf, dest->nextc - dest->buf) < 0)
+        if (xwrite(dest->psh, dest->fd, dest->buf, dest->nextc - dest->buf) < 0)
                 dest->flags |= OUTPUT_ERR;
         dest->nextc = dest->buf;
@@ -198 +200 @@
 
 void
-freestdout(void)
+freestdout(shinstance *psh)
 {
         INTOFF;
-        if (output.buf) {
-                ckfree(output.buf);
-                output.buf = NULL;
-                output.nleft = 0;
+        if (psh->output.buf) {
+                ckfree(psh->output.buf);
+                psh->output.buf = NULL;
+                psh->output.nleft = 0;
         }
         INTON;
@@ -222 +224 @@
 
 void
-out1fmt(const char *fmt, ...)
+out1fmt(shinstance *psh, const char *fmt, ...)
 {
         va_list ap;
 
         va_start(ap, fmt);
-        doformat(out1, fmt, ap);
+        doformat(psh->out1, fmt, ap);
         va_end(ap);
 }
 
 void
-dprintf(const char *fmt, ...)
+dprintf(shinstance *psh, const char *fmt, ...)
 {
         va_list ap;
 
         va_start(ap, fmt);
-        doformat(out2, fmt, ap);
+        doformat(psh->out2, fmt, ap);
         va_end(ap);
-        flushout(out2);
+        flushout(psh->out2);
 }
 
@@ -250 +252 @@
         va_start(ap, fmt);
         strout.nextc = outbuf;
-        strout.nleft = length;
+        strout.nleft = (int)length;
         strout.fd = BLOCK_OUT;
         strout.flags = 0;
@@ -414 +416 @@
                                 num /= base;
                         }
-                        len = (temp + TEMPSIZE - 1) - p;
+                        len = (int)((temp + TEMPSIZE - 1) - p);
                         if (prec < 0)
                                 prec = 1;
@@ -445 +447 @@
                         pad = 0;
                         if (width) {
-                                len = strlen(p);
+                                len = (int)strlen(p);
                                 if (prec >= 0 && len > prec)
                                         len = prec;
@@ -480 +482 @@
 
 int
-xwrite(shinstance *psh, int fd, char *buf, int nbytes)
+xwrite(shinstance *psh, int fd, char *buf, size_t nbytes)
 {
         int ntry;
-        int i;
-        int n;
+        long i;
+        size_t n;
 
         n = nbytes;
@@ -492 +494 @@
                 if (i > 0) {
                         if ((n -= i) <= 0)
-                                return nbytes;
+                                return (int)nbytes;
                         buf += i;
                         ntry = 0;
                 } else if (i == 0) {
                         if (++ntry > 10)
-                                return nbytes - n;
+                                return (int)(nbytes - n);
                 } else if (errno != EINTR) {
                         return -1;
@@ -505 +507 @@
 
 
+#ifdef not_used
 /*
  * Version of ioctl that retries after a signal is caught.
@@ -518 +521 @@
         return i;
 }
+#endif /* not_used */

trunk/src/kash/output.h

@@ -54 +54 @@
 extern struct output *out1;
 extern struct output *out2;*/
+#ifdef _MSC_VER
+# ifndef __attribute__
+#  define __attribute__(a)
+# endif
+#endif
 
-void open_mem(struct shinstance *, char *, int, struct output *);
+void open_mem(char *, int, struct output *);
 void out1str(struct shinstance *, const char *);
 void out2str(struct shinstance *, const char *);
@@ -72 +77 @@
     __attribute__((__format__(__printf__,3,4)));
 void doformat(struct output *, const char *, va_list);
-int xwrite(struct shinstance *, int, char *, int);
+int xwrite(struct shinstance *, int, char *, size_t);
 int xioctl(struct shinstance *, int, unsigned long, char *);
 

trunk/src/kash/parser.c

@@ -257 +257 @@
 
         negate = 0;
-        TRACE(("pipeline: entered\n"));
+        TRACE((psh, "pipeline: entered\n"));
         while (readtoken() == TNOT)
                 negate = !negate;
@@ -313 +313 @@
 
         while (readtoken() == TNOT) {
-                TRACE(("command: TNOT recognized\n"));
+                TRACE((psh, "command: TNOT recognized\n"));
                 negate = !negate;
         }
@@ -353 +353 @@
                 n1->nbinary.ch1 = list(0);
                 if ((got=readtoken()) != TDO) {
-TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
+TRACE((psh, "expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
                         synexpect(TDO);
                 }
@@ -554 +554 @@
 
         while (readtoken() == TNOT) {
-                TRACE(("command: TNOT recognized\n"));
+                TRACE((psh, "command: TNOT recognized\n"));
                 negate = !negate;
         }
@@ -622 +622 @@
 void fixredir(union node *n, const char *text, int err)
         {
-        TRACE(("Fix redir %s %d\n", text, err));
+        TRACE((psh, "Fix redir %s %d\n", text, err));
         if (!err)
                 n->ndup.vname = NULL;
@@ -654 +654 @@
                 if (quoteflag == 0)
                         n->type = NXHERE;
-                TRACE(("Here document %d\n", n->type));
+                TRACE((psh, "Here document %d\n", n->type));
                 if (here->striptabs) {
                         while (*wordtext == '\t')
@@ -753 +753 @@
                                         lasttoken = t = pp -
                                             parsekwd + KWDOFFSET;
-                                        TRACE(("keyword %s recognized\n", tokname[t]));
+                                        TRACE((psh, "keyword %s recognized\n", tokname[t]));
                                         goto out;
                                 }
                         }
                         if(!noalias &&
-                            (ap = lookupalias(wordtext, 1)) != NULL) {
+                            (ap = lookupalias(psh, wordtext, 1)) != NULL) {
                                 pushstring(ap->val, strlen(ap->val), ap);
                                 checkkwd = savecheckkwd;
@@ -769 +769 @@
 #ifdef DEBUG
         if (!alreadyseen)
-            TRACE(("token %s %s\n", tokname[t], t == TWORD ? wordtext : ""));
+            TRACE((psh, "token %s %s\n", tokname[t], t == TWORD ? wordtext : ""));
         else
-            TRACE(("reread token %s %s\n", tokname[t], t == TWORD ? wordtext : ""));
+            TRACE((psh, "reread token %s %s\n", tokname[t], t == TWORD ? wordtext : ""));
 #endif
         return (t);
@@ -1620 +1620 @@
 {
         if (commandname)
-                outfmt(&errout, "%s: %d: ", commandname, startlinno);
-        outfmt(&errout, "Syntax error: %s\n", msg);
-        error((char *)NULL);
+                outfmt(&psh->errout, "%s: %d: ", commandname, startlinno);
+        outfmt(&psh->errout, "Syntax error: %s\n", msg);
+        error(psh, (char *)NULL);
         /* NOTREACHED */
 }

trunk/src/kash/redir.c

@@ -149 +149 @@
                                 default:
                                         INTON;
-                                        error("%d: %s", fd, strerror(errno));
+                                        error(psh, "%d: %s", fd, strerror(errno));
                                         /* NOTREACHED */
                                 }
@@ -244 +244 @@
         return;
 ecreate:
-        error("cannot create %s: %s", fname, errmsg(errno, E_CREAT));
+        error(psh, "cannot create %s: %s", fname, errmsg(psh, errno, E_CREAT));
 eopen:
-        error("cannot open %s: %s", fname, errmsg(errno, E_OPEN));
+        error(psh, "cannot open %s: %s", fname, errmsg(psh, errno, E_OPEN));
 }
 
@@ -263 +263 @@
 
         if (pipe(pip) < 0)
-                error("Pipe call failed");
+                error(psh, "Pipe call failed");
         if (redir->type == NHERE) {
                 len = strlen(redir->nhere.doc->narg.text);
@@ -385 +385 @@
                         return EMPTY;
                 else
-                        error("%d: %s", from, strerror(errno));
+                        error(psh, "%d: %s", from, strerror(errno));
         }
         return newfd;

trunk/src/kash/shfile.h

@@ -75 +75 @@
 char *shfile_getcwd(shfdtab *, char *, int);
 int shfile_isatty(shfdtab *, int);
+/*int shfile_ioctl(shfdtab *, int, unsigned long, char *);*/
 
 #endif

trunk/src/kash/shinstance.c

@@ -52 +52 @@
         psh->stacknxt = psh->stackbase.space;
 
+        /* output.c */
+        psh->output.bufsize = OUTBUFSIZ;
+        psh->output.fd = 1;
+        psh->errout.bufsize = 100;
+        psh->errout.fd = 2;
+        psh->memout.fd = MEM_OUT;
+        psh->out1 = &psh->output;
+        psh->out2 = &psh->errout;
+
+        /* .c */
     }
     return psh;

trunk/src/kash/shinstance.h

@@ -84 +84 @@
     struct output      *out1;
     struct output      *out2;
+    /* output.c */
+#define OUTBUFSIZ BUFSIZ
+#define MEM_OUT -3                      /**< output to dynamically allocated memory */
 
     /* options.h */

trunk/src/kash/show.c

@@ -61 +61 @@
 static void sharg(union node *, FILE *);
 static void indent(int, char *, FILE *);
-static void trstring(char *);
-
-
-void
-showtree(union node *n)
-{
-        trputs("showtree called\n");
+static void trstring(shinstance *, char *);
+
+
+void
+showtree(shinstance *psh, union node *n)
+{
+        trputs(psh, "showtree called\n");
         shtree(n, 1, NULL, stdout);
 }
@@ -274 +274 @@
 #ifdef DEBUG
 void
-trputc(int c)
+trputc(shinstance *psh, int c)
 {
         if (debug(psh) != 1)
@@ -311 +311 @@
 #ifdef DEBUG
 void
-trputs(const char *s)
+trputs(shinstance *psh, const char *s)
 {
         if (debug(psh) != 1)
@@ -320 +320 @@
 
 static void
-trstring(char *s)
+trstring(shinstance *psh, char *s)
 {
         char *p;
@@ -367 +367 @@
                 return;
         while (*ap) {
-                trstring(*ap++);
+                trstring(psh, *ap++);
                 if (*ap)
                         putc(' ', tracefile);
@@ -379 +379 @@
 #ifdef DEBUG
 void
-opentrace(void)
+opentrace(shinstance *psh)
 {
         char s[100];
@@ -424 +424 @@
                 fcntl(fileno(tracefile), F_SETFL, flags | O_APPEND);
 #endif
-        setlinebuf(tracefile);
+        setvbuf(tracefile, (char *)NULL, _IOLBF, 0); //setlinebuf(tracefile);
         fputs("\nTracing started.\n", tracefile);
 }

trunk/src/kash/show.h

@@ -40 +40 @@
 void trargs(struct shinstance *, char **);
 #ifdef DEBUG
-void trputc(int);
-void trputs(const char *);
+void trputc(struct shinstance *, int);
+void trputs(struct shinstance *, const char *);
 void opentrace(struct shinstance *);
 #endif

trunk/src/kash/trap.c

@@ -127 +127 @@
         int n;
 
-        out1str("EXIT ");
+        out1str(psh, "EXIT ");
 #ifndef HAVE_SYS_SIGNAME
         init_sys_signame();
@@ -133 +133 @@
 
         for (n = 1; n < NSIG; n++) {
-                out1fmt("%s", sys_signame[n]);
+                out1fmt(psh, "%s", sys_signame[n]);
                 if ((n == NSIG/2) ||  n == (NSIG - 1))
-                        out1str("\n");
+                        out1str(psh, "\n");
                 else
-                        out1c(' ');
+                        out1c(psh, ' ');
         }
 }
@@ -158 +158 @@
                 for (signo = 0 ; signo <= NSIG ; signo++)
                         if (trap[signo] != NULL) {
-                                out1fmt("trap -- ");
+                                out1fmt(psh, "trap -- ");
                                 print_quoted(trap[signo]);
-                                out1fmt(" %s\n",
+                                out1fmt(psh, " %s\n",
                                     (signo) ? sys_signame[signo] : "EXIT");
                         }
@@ -182 +182 @@
                         }
                         else
-                                error("bad option %s\n", *ap);
+                                error(psh, "bad option %s\n", *ap);
                 }
                 else
@@ -195 +195 @@
 
                 if (signo < 0 || signo > NSIG)
-                        error("%s: bad trap", *ap);
+                        error(psh, "%s: bad trap", *ap);
 
                 INTOFF;
@@ -375 +375 @@
 
 void
-onsig(int signo)
+onsig(shinstance *psh, int signo)
 {
         signal(signo, onsig);
         if (signo == SIGINT && trap[SIGINT] == NULL) {
-                onint();
+                onint(psh);
                 return;
         }
@@ -447 +447 @@
         char *p;
 
-        TRACE(("pid %d, exitshell(%d)\n", getpid(), status));
+        TRACE((psh, "pid %d, exitshell(%d)\n", getpid(), status));
         if (setjmp(loc1.loc)) {
                 goto l1;
@@ -460 +460 @@
         }
 l1:   handler = &loc2;                  /* probably unnecessary */
-        output_flushall();
+        output_flushall(psh);
 #if JOBS
         setjobctl(0);

trunk/src/kash/var.c

@@ -332 +332 @@
         namelen = p - name;
         if (isbad)
-                error("%.*s: bad variable name", namelen, name);
+                error(psh, "%.*s: bad variable name", namelen, name);
         len = namelen + 2;              /* 2 is space for '=' and '\0' */
         if (val == NULL) {
@@ -370 +370 @@
         if (vp != NULL) {
                 if (vp->flags & VREADONLY)
-                        error("%.*s: is read only", vp->name_len, s);
+                        error(psh, "%.*s: is read only", vp->name_len, s);
                 if (flags & VNOSET)
                         return;
@@ -575 +575 @@
 
         if (strcspn(p, "|&;<>()$`\\\"' \t\n*?[]#~=%") == strlen(p)) {
-                out1fmt("%s", p);
+                out1fmt(psh, "%s", p);
                 return;
         }
         while (*p) {
                 if (*p == '\'') {
-                        out1fmt("\\'");
+                        out1fmt(psh, "\\'");
                         p++;
                         continue;
@@ -586 +586 @@
                 q = index(p, '\'');
                 if (!q) {
-                        out1fmt("'%s'", p );
+                        out1fmt(psh, "'%s'", p );
                         return;
                 }
-                out1fmt("'%.*s'", (int)(q - p), p );
+                out1fmt(psh, "'%.*s'", (int)(q - p), p );
                 p = q;
         }
@@ -648 +648 @@
                 vp = *vpp;
                 if (name)
-                        out1fmt("%s ", name);
+                        out1fmt(psh, "%s ", name);
                 for (p = vp->text ; *p != '=' ; p++)
-                        out1c(*p);
+                        out1c(psh, *p);
                 if (!(vp->flags & VUNSET) && show_value) {
-                        out1fmt("=");
-                        print_quoted(++p);
-                }
-                out1c('\n');
+                        out1fmt(psh, "=");
+                        print_quoted(psh, ++p);
+                }
+                out1c(psh, '\n');
         }
         return 0;
@@ -707 +707 @@
 
         if (! in_function(psh))
-                error("Not in a function");
+                error(psh, "Not in a function");
         while ((name = *argptr++) != NULL) {
                 mklocal(name, 0);
@@ -774 +774 @@
                 localvars = lvp->next;
                 vp = lvp->vp;
-                TRACE(("poplocalvar %s", vp ? vp->text : "-"));
+                TRACE((psh, "poplocalvar %s", vp ? vp->text : "-"));
                 if (vp == NULL) {       /* $- saved */
                         memcpy(optlist, lvp->text, sizeof_optlist);
@@ -801 +801 @@
                 setvar(argv[1], argv[2], 0);
         else
-                error("List assignment not implemented");
+                error(psh, "List assignment not implemented");
         return 0;
 }