Changeset 1199 for trunk/src/kash/exec.c

Timestamp:

Oct 7, 2007, 12:04:05 AM (18 years ago)

Author:

bird

Message:

moving globals into shinstance...

File:

• trunk/src/kash/exec.c (modified) (19 diffs)

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;