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

Timestamp:

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

Author:

bird

Message:

moving globals into shinstance...

File:

• trunk/src/kash/expand.c (modified) (6 diffs)

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);