Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

[PATCH] Re: f() { ...; } > file



On Wed, Nov 05, 2008 at 09:20:36PM +0000, Stephane Chazelas wrote:
[...]
> $ bash -c 'foo() { echo a >&3; } 3>&1; foo'
> a
> $ ksh -c 'foo() { echo a >&3; } 3>&1; foo'
> a
> $ zsh -c 'foo() { echo a >&3; } 3>&1; foo'
> foo: 3: bad file descriptor
> $ ARGV0=sh zsh -c 'foo() { command echo a >&3; } 3>&1; foo'
> foo: 3: bad file descriptor
> 
> It looks like zsh evaluates the redirection at the time the
> function is defined rather than when it is called.
> 
> It's OK when declaring the function as
> 
> foo() echo a > file
> or
> foo() (echo a) > file
> 
> instead of
> 
> foo() { echo a; } > file
[...]

The patch below seems to fix it. It just removes the special
case of f() { }. I don't why it was there in the first place.
rev 1.1 of parse.c already had it.

Not sure how many things this patch would break ;)

Index: Src/parse.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/parse.c,v
retrieving revision 1.76
diff -p -u -r1.76 parse.c
--- Src/parse.c	29 Sep 2008 08:46:33 -0000	1.76
+++ Src/parse.c	13 Nov 2008 14:31:10 -0000
@@ -1685,34 +1685,20 @@ par_simple(int *complex, int nr)
 	    onp = ecnpats;
 	    ecnpats = 0;
 
-	    if (tok == INBRACE) {
-		int c = 0;
+	    int ll, sl, pl, c = 0;
 
-		yylex();
-		par_list(&c);
-		if (tok != OUTBRACE) {
-		    cmdpop();
-		    lineno += oldlineno;
-		    ecnpats = onp;
-		    ecssub = oecssub;
-		    YYERROR(oecused);
-		}
-		yylex();
-	    } else {
-		int ll, sl, pl, c = 0;
-
-		ll = ecadd(0);
-		sl = ecadd(0);
-		pl = ecadd(WCB_PIPE(WC_PIPE_END, 0));
-
-		if (!par_cmd(&c)) {
-		    cmdpop();
-		    YYERROR(oecused);
-		}
-
-		set_sublist_code(sl, WC_SUBLIST_END, 0, ecused - 1 - sl, c);
-		set_list_code(ll, (Z_SYNC | Z_END), c);
+	    ll = ecadd(0);
+	    sl = ecadd(0);
+	    pl = ecadd(WCB_PIPE(WC_PIPE_END, 0));
+
+	    if (!par_cmd(&c)) {
+		cmdpop();
+		YYERROR(oecused);
 	    }
+
+	    set_sublist_code(sl, WC_SUBLIST_END, 0, ecused - 1 - sl, c);
+	    set_list_code(ll, (Z_SYNC | Z_END), c);
+
 	    cmdpop();
 
 	    ecadd(WCB_END());

-- 
Stéphane



Messages sorted by: Reverse Date, Date, Thread, Author