Module Name:    src
Committed By:   kre
Date:           Mon Jun 19 02:51:51 UTC 2017

Modified Files:
        src/bin/sh: eval.c

Log Message:
Fix from FreeBSD (applied there in July 2008...)

Don't dump core with input like sh -c 'x=; echo >&$x' - that is where
the word after a >& or <& redirect expands to nothing at all.


To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/bin/sh/eval.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/eval.c
diff -u src/bin/sh/eval.c:1.148 src/bin/sh/eval.c:1.149
--- src/bin/sh/eval.c:1.148	Sat Jun 17 11:53:24 2017
+++ src/bin/sh/eval.c	Mon Jun 19 02:51:51 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: eval.c,v 1.148 2017/06/17 11:53:24 kre Exp $	*/
+/*	$NetBSD: eval.c,v 1.149 2017/06/19 02:51:51 kre Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
 #else
-__RCSID("$NetBSD: eval.c,v 1.148 2017/06/17 11:53:24 kre Exp $");
+__RCSID("$NetBSD: eval.c,v 1.149 2017/06/19 02:51:51 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -546,7 +546,7 @@ expredir(union node *n)
 		case NFROMFD:
 		case NTOFD:
 			if (redir->ndup.vname) {
-				expandarg(redir->ndup.vname, &fn, EXP_FULL | EXP_TILDE);
+				expandarg(redir->ndup.vname, &fn, EXP_TILDE | EXP_REDIR);
 				fixredir(redir, fn.list->text, 1);
 			}
 			break;

Reply via email to