Additional cleanup after cherry-picking patches.

hvdijk · Apr 25, 2024 · b577fdc · b577fdc
2 parents fc11d6f + 06fdaa4
commit b577fdc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/src/redir.c b/src/redir.c
@@ -247,15 +247,15 @@ openhere(union node *redir)
 	int pip[2];
 	size_t len = 0;
 
-	if (pipe(pip) < 0)
-		sh_error("Pipe call failed");
-
 	p = redir->nhere.doc->narg.text;
 	if (redir->type == NXHERE) {
 		expandarg(redir->nhere.doc, NULL, EXP_QUOTED);
 		p = stackblock();
 	}
 
+	if (pipe(pip) < 0)
+		sh_error("Pipe call failed");
+
 	len = strlen(p);
 	if (len <= PIPESIZE) {
 		xwrite(pip[1], p, len);

diff --git a/src/var.c b/src/var.c
@@ -289,9 +289,6 @@ struct var *setvareq(char *s, int flags)
 			sh_error("%s: is read only", n);
 		}
 
-		if (flags & VNOSET)
-			goto out;
-
 		if (vp->func && (flags & VNOFUNC) == 0 && (vp->flags & VLATEFUNC) == 0)
 			(*vp->func)(strchrnul(s, '=') + 1);
 
@@ -312,8 +309,6 @@ struct var *setvareq(char *s, int flags)
 			flags &= ~(VEXPORT|VREADONLY);
 		}
 	} else {
-		if (flags & VNOSET)
-			goto out;
 		if ((flags & (VEXPORT|VREADONLY|VSTRFIXED|VUNSET)) == VUNSET)
 			goto out_free;
 		/* not found */
@@ -335,7 +330,6 @@ struct var *setvareq(char *s, int flags)
 	*s = '\0';
 	if (vp->func && flags & VLATEFUNC)
 		(*vp->func)(s + 1);
-out:
 	return vp;
 }
 

diff --git a/src/var.h b/src/var.h
@@ -55,7 +55,6 @@
 #define VSTACK		0x10	/* text is allocated on the stack */
 #define VUNSET		0x20	/* the variable is not set */
 #define VNOFUNC		0x40	/* don't call the callback function */
-#define VNOSET		0x80	/* do not set variable - just readonly test */
 #define VNOSAVE		0x100	/* when text is on the heap before setvareq */
 #define VLATEFUNC	0x200	/* call the callback function after the value has been changed */
 #define VUSER1		0x400	/* special flag with per-variable meaning