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

Timestamp:

Oct 6, 2007, 11:19:19 PM (18 years ago)

Author:

bird

Message:

moving globals into shinstance...

File:

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

trunk/src/kash/exec.c

@@ -146 +146 @@
         TRACE(("shellexec: argv[0]=%s idx=%d\n", argv[0], idx));
         if (strchr(argv[0], '/') != NULL) {
-                cmdname = stalloc(strlen(argv[0]) + 5);
+                cmdname = stalloc(psh, strlen(argv[0]) + 5);
                 strcpy(cmdname, argv[0]);
                 tryexec(cmdname, argv, envp, vforked, has_ext);
                 TRACE(("shellexec: cmdname=%s\n", cmdname));
-                stunalloc(cmdname);
+                stunalloc(psh, cmdname);
                 e = errno;
         } else {
@@ -160 +160 @@
                                         e = errno;
                         }
-                        stunalloc(cmdname);
+                        stunalloc(psh, cmdname);
                 }
         }
@@ -275 +275 @@
                 if (ap == &newargs[NEWARGS])
 bad:              error("Bad #! line");
-                STARTSTACKSTR(outp);
+                STARTSTACKSTR(psh, outp);
                 do {
-                        STPUTC(c, outp);
+                        STPUTC(psh, c, outp);
                 } while (--n >= 0 && (c = *inp++) != ' ' && c != '\t' && c != '\n');
-                STPUTC('\0', outp);
+                STPUTC(psh, '\0', outp);
                 n++, inp--;
-                *ap++ = grabstackstr(outp);
+                *ap++ = grabstackstr(psh, outp);
         }
         if (ap == newargs + 1) {        /* if no args, maybe no exec is needed */
@@ -349 +349 @@
         len += 4; /* "4" is for .exe/.com/.cmd/.bat/.btm */
 #endif
-        while (stackblocksize() < len)
-                growstackblock();
-        q = stackblock();
+        while (stackblocksize(psh) < len)
+                growstackblock(psh);
+        q = stackblock(psh);
         if (p != start) {
                 memcpy(q, start, p - start);
@@ -375 +375 @@
         else
                 *path = NULL;
-        return stalloc(len);
+        return stalloc(psh, len);
 }
 
@@ -485 +485 @@
                 do {
                         name = padvance(&path, cmdp->cmdname);
-                        stunalloc(name);
+                        stunalloc(psh, name);
                 } while (--idx >= 0);
                 out1str(name);
@@ -623 +623 @@
 loop:
         while ((fullname = padvance(&path, name)) != NULL) {
-                stunalloc(fullname);
+                stunalloc(psh, fullname);
                 idx++;
                 if (pathopt) {
@@ -664 +664 @@
                         if (act & DO_NOFUNC)
                                 goto loop;
-                        stalloc(strlen(fullname) + 1);
+                        stalloc(psh, strlen(fullname) + 1);
                         readcmdfile(fullname);
                         if ((cmdp = cmdlookup(name, 0)) == NULL ||
                             cmdp->cmdtype != CMDFUNCTION)
                                 error("%s not defined in %s", name, fullname);
-                        stunalloc(fullname);
+                        stunalloc(psh, fullname);
                         goto success;
                 }
@@ -689 +689 @@
                 INTOFF;
                 if (act & DO_ALTPATH) {
-                        stalloc(strlen(fullname) + 1);
+                        stalloc(psh, strlen(fullname) + 1);
                         cmdp = &loc_cmd;
                 } else
@@ -1137 +1137 @@
                                 do {
                                         name = padvance(&path, arg);
-                                        stunalloc(name);
+                                        stunalloc(psh, name);
                                 } while (--j >= 0);
                                 if (!v_flag)