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

Timestamp:

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

Author:

bird

Message:

moving globals into shinstance...

File:

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

trunk/src/kash/eval.c

@@ -125 +125 @@
 
 RESET {
-        evalskip = 0;
-        loopnest = 0;
-        funcnest = 0;
+        psh->evalskip = 0;
+        psh->loopnest = 0;
+        psh->funcnest = 0;
 }
 
 SHELLPROC {
-        exitstatus = 0;
+        psh->exitstatus = 0;
 }
 #endif
@@ -176 +176 @@
                 p = argv[1];
                 if (argc > 2) {
-                        STARTSTACKSTR(concat);
+                        STARTSTACKSTR(psh, concat);
                         ap = argv + 2;
                         for (;;) {
                                 while (*p)
-                                        STPUTC(*p++, concat);
+                                        STPUTC(psh, *p++, concat);
                                 if ((p = *ap++) == NULL)
                                         break;
-                                STPUTC(' ', concat);
+                                STPUTC(psh, ' ', concat);
                         }
-                        STPUTC('\0', concat);
-                        p = grabstackstr(concat);
+                        STPUTC(psh, '\0', concat);
+                        p = grabstackstr(psh, concat);
                 }
                 evalstring(psh, p, EV_TESTED);
@@ -594 +594 @@
                                 shfile_close(&psh->fdtab, pip[1]);
                         }
-                        psh->eflag = 0;
+                        eflag(psh) = 0;
                         evaltree(psh, n, EV_EXIT);
                         /* NOTREACHED */
@@ -765 +765 @@
         *argv = NULL;
         lastarg = NULL;
-        if (psh->iflag && psh->funcnest == 0 && argc > 0)
+        if (iflag(psh) && psh->funcnest == 0 && argc > 0)
                 lastarg = argv[-1];
         argv -= argc;
 
         /* Print the command if xflag is set. */
-        if (psh->xflag) {
+        if (xflag(psh)) {
                 char sep = 0;
                 out2str(psh, ps4val(psh));
@@ -1062 +1062 @@
                 if (flags == EV_BACKCMD) {
                         backcmd->buf = psh->memout.buf;
-                        backcmd->nleft = psh->memout.nextc - psh->memout.buf;
+                        backcmd->nleft = (int)(psh->memout.nextc - psh->memout.buf);
                         psh->memout.buf = NULL;
                 }
@@ -1101 +1101 @@
         popstackmark(psh, &smark);
 
-        if (psh->eflag && psh->exitstatus && !(flags & EV_TESTED))
+        if (eflag(psh) && psh->exitstatus && !(flags & EV_TESTED))
                 exitshell(psh, psh->exitstatus);
 }
@@ -1160 +1160 @@
 breakcmd(shinstance *psh, int argc, char **argv)
 {
-        int n = argc > 1 ? number(argv[1]) : 1;
+        int n = argc > 1 ? number(psh, argv[1]) : 1;
 
         if (n > psh->loopnest)
@@ -1179 +1179 @@
 returncmd(shinstance *psh, int argc, char **argv)
 {
-        int ret = argc > 1 ? number(argv[1]) : psh->exitstatus;
+        int ret = argc > 1 ? number(psh, argv[1]) : psh->exitstatus;
 
         if (psh->funcnest) {
@@ -1215 +1215 @@
                 struct strlist *sp;
 
-                psh->iflag = 0;         /* exit on error */
-                psh->mflag = 0;
+                iflag(psh) = 0;         /* exit on error */
+                mflag(psh) = 0;
                 optschanged(psh);
                 for (sp = psh->cmdenviron; sp; sp = sp->next)
@@ -1230 +1230 @@
         static clock_t tpm = 0;
         clock_t mins;
-        int i;
+        size_t i;
 
         if (!tpm)