From e3c9a7dd70976157cd7141ac8b25aa71f1eb6842 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 25 May 2010 20:55:05 +0800
Subject: [VAR] Move unsetvar functionality into setvareq

This patch moves the unsetvar code into setvareq so that we can
no have a pathological case of an unset variable hanging around
unless it has a bit pinning it like VEXPORT.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
 src/var.c | 54 +++++++++++++++++-------------------------------------
 1 file changed, 17 insertions(+), 37 deletions(-)

(limited to 'src/var.c')

diff --git a/src/var.c b/src/var.c
index fc6d367..12f2f6c 100644
--- a/src/var.c
+++ b/src/var.c
@@ -266,10 +266,22 @@ setvareq(char *s, int flags)
 		if ((vp->flags & (VTEXTFIXED|VSTACK)) == 0)
 			ckfree(vp->text);
 
+		if (((flags & (VEXPORT|VREADONLY|VSTRFIXED|VUNSET)) |
+		     (vp->flags & VSTRFIXED)) == VUNSET) {
+			*vpp = vp->next;
+			ckfree(vp);
+out_free:
+			if ((flags & (VTEXTFIXED|VSTACK|VNOSAVE)) == VNOSAVE)
+				ckfree(s);
+			return;
+		}
+
 		flags |= vp->flags & ~(VTEXTFIXED|VSTACK|VNOSAVE|VUNSET);
 	} else {
 		if (flags & VNOSET)
 			return;
+		if ((flags & (VEXPORT|VREADONLY|VSTRFIXED|VUNSET)) == VUNSET)
+			goto out_free;
 		/* not found */
 		vp = ckmalloc(sizeof (*vp));
 		vp->next = *vpp;
@@ -588,7 +600,6 @@ unsetcmd(int argc, char **argv)
 	char **ap;
 	int i;
 	int flag = 0;
-	int ret = 0;
 
 	while ((i = nextopt("vf")) != '\0') {
 		flag = i;
@@ -596,15 +607,13 @@ unsetcmd(int argc, char **argv)
 
 	for (ap = argptr; *ap ; ap++) {
 		if (flag != 'f') {
-			i = unsetvar(*ap);
-			ret |= i;
-			if (!(i & 2))
-				continue;
+			unsetvar(*ap);
+			continue;
 		}
 		if (flag != 'v')
 			unsetfunc(*ap);
 	}
-	return ret & 1;
+	return 0;
 }
 
 
@@ -612,38 +621,9 @@ unsetcmd(int argc, char **argv)
  * Unset the specified variable.
  */
 
-int
-unsetvar(const char *s)
+void unsetvar(const char *s)
 {
-	struct var **vpp;
-	struct var *vp;
-	int retval;
-
-	vpp = findvar(hashvar(s), s);
-	vp = *vpp;
-	retval = 2;
-	if (vp) {
-		int flags = vp->flags;
-
-		retval = 1;
-		if (flags & VREADONLY)
-			goto out;
-		if ((flags & VSTRFIXED) == 0) {
-			INTOFF;
-			if ((flags & (VTEXTFIXED|VSTACK)) == 0)
-				ckfree(vp->text);
-			*vpp = vp->next;
-			ckfree(vp);
-			INTON;
-		} else if (!(flags & VUNSET)) {
-			setvar(s, 0, 0);
-			vp->flags &= ~VEXPORT;
-		}
-		retval = 0;
-	}
-
-out:
-	return retval;
+	setvar(s, 0, 0);
 }
 
 
-- 
cgit 1.4.1

owrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/bin/cash/options.h?id=db8e328cd294bfc69a615420b04b1bf0062a100a&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-02-15 17:48:05 -0500'>2019-02-15</span></td><td><a href='/src/commit/bin/hi.c?id=4bd9899913e57409409a05cd1b4b50a1773d4ee1&amp;follow=1'>Highlight Interp as yellow</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-02-15 17:47:44 -0500'>2019-02-15</span></td><td><a href='/src/commit/bin/hi.c?id=30132e89f935e247e3ba76c63abd736db52448ca&amp;follow=1'>Highlight strings in sh command substitutions</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-02-15 15:26:05 -0500'>2019-02-15</span></td><td><a href='/src/commit/home/.config/nvim/init.vim?id=f8ab260a0693218701d44bd87c4f2c0a5d11f88b&amp;follow=1'>Add nmap gp</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-02-14 02:16:27 -0500'>2019-02-14</span></td><td><a href='/src/commit/bin/up.sh?id=656e95683afe196e53ce1bd96ac75fe8a6dea5b8&amp;follow=1'>Avoid newline when copying URL to pasteboard</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-02-13 23:30:53 -0500'>2019-02-13</span></td><td><a href='/src/commit/txt/books.txt?id=a9024581ad338b0cbd4282a4fc5e44fee943fe34&amp;follow=1'>Add forgotten "sixth" book of H2G2</a></td><td>June McEnroe