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

Timestamp:

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

Author:

bird

Message:

moving globals into shinstance...

File:

• trunk/src/kash/miscbltin.c (modified) (7 diffs)

trunk/src/kash/miscbltin.c

@@ -125 +125 @@
         status = 0;
         startword = 2;
-        STARTSTACKSTR(p);
+        STARTSTACKSTR(psh, p);
         for (;;) {
                 if (read(0, &c, 1) != 1) {
@@ -139 +139 @@
                         }
                         if (c != '\n')
-                                STPUTC(c, p);
+                                STPUTC(psh, c, p);
                         continue;
                 }
@@ -153 +153 @@
                                 /* Ignore leading IFS whitespace */
                                 if (saveall)
-                                        STPUTC(c, p);
+                                        STPUTC(psh, c, p);
                                 continue;
                         }
@@ -160 +160 @@
                                 startword = 2;
                                 if (saveall)
-                                        STPUTC(c, p);
+                                        STPUTC(psh, c, p);
                                 continue;
                         }
@@ -171 +171 @@
                                 /* Not just a spare terminator */
                                 saveall++;
-                        STPUTC(c, p);
+                        STPUTC(psh, c, p);
                         continue;
                 }
@@ -181 +181 @@
                         /* Last variable needs all IFS chars */
                         saveall++;
-                        STPUTC(c, p);
+                        STPUTC(psh, c, p);
                         continue;
                 }
 
-                STACKSTRNUL(p);
-                setvar(*ap, stackblock(), 0);
+                STACKSTRNUL(psh, p);
+                setvar(*ap, stackblock(psh), 0);
                 ap++;
-                STARTSTACKSTR(p);
-        }
-        STACKSTRNUL(p);
+                STARTSTACKSTR(psh, p);
+        }
+        STACKSTRNUL(psh, p);
 
         /* Remove trailing IFS chars */
-        for (; stackblock() <= --p; *p = 0) {
+        for (; stackblock(psh) <= --p; *p = 0) {
                 if (!strchr(ifs, *p))
                         break;
@@ -203 +203 @@
                         break;
         }
-        setvar(*ap, stackblock(), 0);
+        setvar(*ap, stackblock(psh), 0);
 
         /* Set any remaining args to "" */