Changeset 1201 in kBuild for trunk/src/kash/expand.c

Timestamp:

Oct 6, 2007 11:57:35 PM (17 years ago)

Author:

bird

Message:

input.c

File:

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

trunk/src/kash/expand.c

@@ -122 +122 @@
 
 void
-expandhere(union node *arg, int fd)
+expandhere(shinstance *psh, union node *arg, int fd)
 {
         psh->herefd = fd;
-        expandarg(arg, (struct arglist *)NULL, 0);
-        xwrite(psh, fd, stackblock(psh), expdest - stackblock(psh));
+        expandarg(psh, arg, (struct arglist *)NULL, 0);
+        xwrite(psh, fd, stackblock(psh), psh->expdest - stackblock(psh));
 }
 
@@ -164 +164 @@
         } else {
                 if (flag & EXP_REDIR) /*XXX - for now, just remove escapes */
-                        rmescapes(p);
+                        rmescapes(psh, p);
                 sp = (struct strlist *)stalloc(psh, sizeof (struct strlist));
                 sp->text = p;
@@ -231 +231 @@
                         break;
                 case CTLENDARI:
-                        expari(flag);
+                        expari(psh, flag);
                         break;
                 case ':':
@@ -398 +398 @@
         removerecordregions(begoff);
         if (quotes)
-                rmescapes(p+2);
+                rmescapes(psh, p+2);
         result = arith(p+2);
         fmtstr(p, 12, "%d", result);
@@ -522 +522 @@
         case VSQUESTION:
                 if (*p != CTLENDVAR) {
-                        outfmt(&errout, "%s\n", startp);
+                        outfmt(&psh->errout, "%s\n", startp);
                         error(psh, (char *)NULL);
                 }
@@ -534 +534 @@
                         c = *loc;
                         *loc = '\0';
-                        if (patmatch(str, startp, varflags & VSQUOTE))
+                        if (patmatch(psh, str, startp, varflags & VSQUOTE))
                                 goto recordleft;
                         *loc = c;
@@ -546 +546 @@
                         c = *loc;
                         *loc = '\0';
-                        if (patmatch(str, startp, varflags & VSQUOTE))
+                        if (patmatch(psh, str, startp, varflags & VSQUOTE))
                                 goto recordleft;
                         *loc = c;
@@ -563 +563 @@
         case VSTRIMRIGHT:
                 for (loc = str - 1; loc >= startp;) {
-                        if (patmatch(str, loc, varflags & VSQUOTE))
+                        if (patmatch(psh, str, loc, varflags & VSQUOTE))
                                 goto recordright;
                         loc--;
@@ -579 +579 @@
         case VSTRIMRIGHTMAX:
                 for (loc = startp; loc < str - 1; loc++) {
-                        if (patmatch(str, loc, varflags & VSQUOTE))
+                        if (patmatch(psh, str, loc, varflags & VSQUOTE))
                                 goto recordright;
                         if ((varflags & VSQUOTE) && *loc == CTLESC)
@@ -1111 +1111 @@
 nometa:
                         *exparg.lastp = str;
-                        rmescapes(str->text);
+                        rmescapes(psh, str->text);
                         exparg.lastp = &str->next;
                 } else {
@@ -1235 +1235 @@
                 if (dp->d_name[0] == '.' && ! matchdot)
                         continue;
-                if (patmatch(start, dp->d_name, 0)) {
+                if (patmatch(psh, start, dp->d_name, 0)) {
                         if (atend) {
                                 scopy(dp->d_name, enddir);
@@ -1516 +1516 @@
         STPUTC(psh, '\0', expdest);
         p = grabstackstr(psh, expdest);
-        result = patmatch(p, val, 0);
+        result = patmatch(psh, p, val, 0);
         popstackmark(psh, &smark);
         return result;
@@ -1551 +1551 @@
 
 int
-wordexpcmd(int argc, char **argv)
+wordexpcmd(shinstance *psh, int argc, char **argv)
 {
         size_t len;