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

Timestamp:

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

Author:

bird

Message:

moving globals into shinstance...

File:

• trunk/src/kash/var.c (modified) (8 diffs)

trunk/src/kash/var.c

@@ -332 +332 @@
         namelen = p - name;
         if (isbad)
-                error("%.*s: bad variable name", namelen, name);
+                error(psh, "%.*s: bad variable name", namelen, name);
         len = namelen + 2;              /* 2 is space for '=' and '\0' */
         if (val == NULL) {
@@ -370 +370 @@
         if (vp != NULL) {
                 if (vp->flags & VREADONLY)
-                        error("%.*s: is read only", vp->name_len, s);
+                        error(psh, "%.*s: is read only", vp->name_len, s);
                 if (flags & VNOSET)
                         return;
@@ -575 +575 @@
 
         if (strcspn(p, "|&;<>()$`\\\"' \t\n*?[]#~=%") == strlen(p)) {
-                out1fmt("%s", p);
+                out1fmt(psh, "%s", p);
                 return;
         }
         while (*p) {
                 if (*p == '\'') {
-                        out1fmt("\\'");
+                        out1fmt(psh, "\\'");
                         p++;
                         continue;
@@ -586 +586 @@
                 q = index(p, '\'');
                 if (!q) {
-                        out1fmt("'%s'", p );
+                        out1fmt(psh, "'%s'", p );
                         return;
                 }
-                out1fmt("'%.*s'", (int)(q - p), p );
+                out1fmt(psh, "'%.*s'", (int)(q - p), p );
                 p = q;
         }
@@ -648 +648 @@
                 vp = *vpp;
                 if (name)
-                        out1fmt("%s ", name);
+                        out1fmt(psh, "%s ", name);
                 for (p = vp->text ; *p != '=' ; p++)
-                        out1c(*p);
+                        out1c(psh, *p);
                 if (!(vp->flags & VUNSET) && show_value) {
-                        out1fmt("=");
-                        print_quoted(++p);
-                }
-                out1c('\n');
+                        out1fmt(psh, "=");
+                        print_quoted(psh, ++p);
+                }
+                out1c(psh, '\n');
         }
         return 0;
@@ -707 +707 @@
 
         if (! in_function(psh))
-                error("Not in a function");
+                error(psh, "Not in a function");
         while ((name = *argptr++) != NULL) {
                 mklocal(name, 0);
@@ -774 +774 @@
                 localvars = lvp->next;
                 vp = lvp->vp;
-                TRACE(("poplocalvar %s", vp ? vp->text : "-"));
+                TRACE((psh, "poplocalvar %s", vp ? vp->text : "-"));
                 if (vp == NULL) {       /* $- saved */
                         memcpy(optlist, lvp->text, sizeof_optlist);
@@ -801 +801 @@
                 setvar(argv[1], argv[2], 0);
         else
-                error("List assignment not implemented");
+                error(psh, "List assignment not implemented");
         return 0;
 }