From 1f81bdcb47d42fc72340503eca46eb0a8b64c4ef Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Mon, 1 Sep 2008 20:18:46 +0000
Subject: 25587: fix a==(stuff) and associated stuff.

---
 Src/exec.c  |  7 +++++++
 Src/parse.c | 12 ++++++++++++
 Src/subst.c |  1 +
 3 files changed, 20 insertions(+)

(limited to 'Src')

diff --git a/Src/exec.c b/Src/exec.c
index 06f08ffb8..cf0efed19 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -2220,6 +2220,7 @@ execcmd(Estate state, int input, int output, int how, int last1)
     doneps4 = 0;
     redir = (wc_code(*state->pc) == WC_REDIR ? ecgetredirs(state) : NULL);
     if (wc_code(*state->pc) == WC_ASSIGN) {
+	cmdoutval = 0;
 	varspc = state->pc;
 	while (wc_code((code = *state->pc)) == WC_ASSIGN)
 	    state->pc += (WC_ASSIGN_TYPE(code) == WC_ASSIGN_SCALAR ?
@@ -2236,6 +2237,12 @@ execcmd(Estate state, int input, int output, int how, int last1)
      * they don't modify their argument strings. */
     args = (type == WC_SIMPLE ?
 	    ecgetlist(state, WC_SIMPLE_ARGC(code), EC_DUP, &htok) : NULL);
+    /*
+     * If assignment but no command get the status from variable
+     * assignment.
+     */
+    if (!args && varspc)
+	lastval = errflag ? errflag : cmdoutval;
 
     for (i = 0; i < 10; i++) {
 	save[i] = -2;
diff --git a/Src/parse.c b/Src/parse.c
index 295b4922f..0812f9137 100644
--- a/Src/parse.c
+++ b/Src/parse.c
@@ -1567,6 +1567,18 @@ par_simple(int *complex, int nr)
 		str = p + 1;
 	    } else
 		equalsplit(tokstr, &str);
+	    for (p = str; *p; p++) {
+		/*
+		 * We can't treat this as "simple" if it contains
+		 * expansions that require process subsitution, since then
+		 * we need process handling.
+		 */
+		if (p[1] == Inpar &&
+		    (*p == Equals || *p == Inang || *p == Outang)) {
+		    *complex = 1;
+		    break;
+		}
+	    }
 	    ecstr(name);
 	    ecstr(str);
 	    isnull = 0;
diff --git a/Src/subst.c b/Src/subst.c
index 7906f80bd..6c3487e9a 100644
--- a/Src/subst.c
+++ b/Src/subst.c
@@ -66,6 +66,7 @@ prefork(LinkList list, int flags)
 	    else
 		setdata(node, (void *) getoutputfile(str));	/* =(...) */
 	    if (!getdata(node)) {
+		setdata(node, dupstring(""));
 		unqueue_signals();
 		return;
 	    }
-- 
cgit 1.4.1