From fd1dda24018ca173507ff60eb146ea758f4d2d25 Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Sun, 2 Apr 2017 16:07:04 +0000
Subject: [PATCH] refactor global(x) into isglobal(x, true)

---
 var.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/var.c b/var.c
index 1c5ae6f..c360032 100644
--- a/var.c
+++ b/var.c
@@ -28,7 +28,7 @@
 #include <sys/sysctl.h>
 #endif
 
-__RCSID("$MirOS: src/bin/mksh/var.c,v 1.211 2017/04/02 15:51:20 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/var.c,v 1.212 2017/04/02 16:07:04 tg Exp $");
 
 /*-
  * Variables
@@ -227,6 +227,13 @@ array_index_calc(const char *n, bool *arrayp, uint32_t *valp)
  */
 struct tbl *
 global(const char *n)
+{
+	return (isglobal(n, true));
+}
+
+/* search for variable; if not found, return NULL or create globally */
+struct tbl *
+isglobal(const char *n, bool docreate)
 {
 	struct tbl *vp;
 	union mksh_cchack vname;
@@ -294,17 +301,19 @@ global(const char *n)
 		goto out;
 	}
 	l = varsearch(e->loc, &vp, vn, h);
+	if (vp == NULL && docreate)
+		vp = ktenter(&l->vars, vn, h);
+	else
+		docreate = false;
 	if (vp != NULL) {
 		if (array)
 			vp = arraysearch(vp, val);
-		goto out;
+		if (docreate) {
+			vp->flag |= DEFINED;
+			if (special(vn))
+				vp->flag |= SPECIAL;
+		}
 	}
-	vp = ktenter(&l->vars, vn, h);
-	if (array)
-		vp = arraysearch(vp, val);
-	vp->flag |= DEFINED;
-	if (special(vn))
-		vp->flag |= SPECIAL;
  out:
 	last_lookup_was_array = array;
 	if (vn != n)