Re: Bug in alias expansion

[Bart Schaefer <schaefer@brasslantern.com>]

On Nov 15,  1:52pm, Bart Schaefer wrote:
}
} So the real question may be, how did we get as far as execsimple()
} without having expanded all the aliases first?

Without being able to answer that ... we can work around the issue by
shoving alias expansion down into parse_string() like so:


diff --git a/Src/exec.c b/Src/exec.c
index c0ee527..b1ca551 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -217,6 +217,11 @@ parse_string(char *s, int reset_lineno)
 {
     Eprog p;
     zlong oldlineno;
+    int noalias = noaliases;
+
+    /* See addvars() */
+    if (noaliases < 0)
+	noaliases = 0;
 
     zcontext_save();
     inpush(s, INP_LINENO, NULL);
@@ -231,6 +236,7 @@ parse_string(char *s, int reset_lineno)
     strinend();
     inpop();
     zcontext_restore();
+    noaliases = noalias;
     return p;
 }
 
@@ -2249,10 +2255,15 @@ static void
 addvars(Estate state, Wordcode pc, int addflags)
 {
     LinkList vl;
+    int noalias = noaliases;
     int xtr, isstr, htok = 0;
     char **arr, **ptr, *name;
     int flags;
 
+    /* Signal to parse_string() that it should expand aliases */
+    if (!noaliases)
+	noaliases = -1;
+
     Wordcode opc = state->pc;
     wordcode ac;
     local_list1(svl);
@@ -2291,10 +2302,8 @@ addvars(Estate state, Wordcode pc, int addflags)
 	if (vl && htok) {
 	    prefork(vl, (isstr ? (PREFORK_SINGLE|PREFORK_ASSIGN) :
 			 PREFORK_ASSIGN), NULL);
-	    if (errflag) {
-		state->pc = opc;
-		return;
-	    }
+	    if (errflag)
+		break;
 	    if (!isstr || (isset(GLOBASSIGN) && isstr &&
 			   haswilds((char *)getdata(firstnode(vl))))) {
 		globlist(vl, 0);
@@ -2305,10 +2314,8 @@ addvars(Estate state, Wordcode pc, int addflags)
 		if (isset(GLOBASSIGN) && isstr)
 		    unsetparam(name);
 	    }
-	    if (errflag) {
-		state->pc = opc;
-		return;
-	    }
+	    if (errflag)
+		break;
 	}
 	if (isstr && (empty(vl) || !nextnode(firstnode(vl)))) {
 	    Param pm;
@@ -2331,8 +2338,7 @@ addvars(Estate state, Wordcode pc, int addflags)
 		    (pm->node.flags & PM_RESTRICTED)) {
 		    zerr("%s: restricted", pm->node.nam);
 		    zsfree(val);
-		    state->pc = opc;
-		    return;
+		    break;
 		}
 		if (strcmp(name, "STTY") == 0) {
 		    zsfree(STTYval);
@@ -2346,10 +2352,8 @@ addvars(Estate state, Wordcode pc, int addflags)
 		opts[ALLEXPORT] = allexp;
 	    } else
 	    	pm = assignsparam(name, val, myflags);
-	    if (errflag) {
-		state->pc = opc;
-		return;
-	    }
+	    if (errflag)
+		break;
 	    continue;
 	}
 	if (vl) {
@@ -2377,6 +2381,7 @@ addvars(Estate state, Wordcode pc, int addflags)
 	}
     }
     state->pc = opc;
+    noaliases = noalias;
 }
 
 /**/