summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2000-05-10 19:15:58 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2000-05-10 19:15:58 +0000
commitade36632168515a54b507ba9ab6a7cdcf3502e0c (patch)
tree90423356bb44f7cb19a4fed1c5bb62130eac896f /Src
parent94a6e3c22740dd259cd6435bbc5f9580337da869 (diff)
downloadzsh-ade36632168515a54b507ba9ab6a7cdcf3502e0c.tar.gz
zsh-ade36632168515a54b507ba9ab6a7cdcf3502e0c.tar.xz
zsh-ade36632168515a54b507ba9ab6a7cdcf3502e0c.zip
11314: fix for typeset -U not updating value in environment
Diffstat (limited to 'Src')
-rw-r--r--Src/builtin.c19
-rw-r--r--Src/params.c7
2 files changed, 16 insertions, 10 deletions
diff --git a/Src/builtin.c b/Src/builtin.c
index 68155d2c6..b2f82803c 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -1607,11 +1607,20 @@ typeset_single(char *cname, char *pname, Param pm, int func,
 	}
 	if ((on & PM_UNIQUE) && !(pm->flags & PM_READONLY & ~off)) {
 	    Param apm;
-	    if (PM_TYPE(pm->flags) == PM_ARRAY)
-		uniqarray((*pm->gets.afn) (pm));
-	    else if (PM_TYPE(pm->flags) == PM_SCALAR && pm->ename &&
-		     (apm = (Param) paramtab->getnode(paramtab, pm->ename)))
-		uniqarray((*apm->gets.afn) (apm));
+	    char **x;
+	    if (PM_TYPE(pm->flags) == PM_ARRAY) {
+		x = (*pm->gets.afn)(pm);
+		uniqarray(x);
+		if (pm->ename && x)
+		    arrfixenv(pm->ename, x);
+	    } else if (PM_TYPE(pm->flags) == PM_SCALAR && pm->ename &&
+		       (apm =
+			(Param) paramtab->getnode(paramtab, pm->ename))) {
+		x = (*apm->gets.afn)(apm);
+		uniqarray(x);
+		if (x)
+		    arrfixenv(pm->nam, x);
+	    }
 	}
 	pm->flags = (pm->flags | on) & ~(off | PM_UNSET);
 	/* This auxlen/pm->ct stuff is a nasty hack. */
diff --git a/Src/params.c b/Src/params.c
index 74c4ee1c8..abdcd8e2e 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -2299,10 +2299,9 @@ colonarrsetfn(Param pm, char *x)
 }
 
 /**/
-int
+void
 uniqarray(char **x)
 {
-    int changes = 0;
     char **t, **p = x;
 
     if (!x || !*x)
@@ -2312,10 +2311,8 @@ uniqarray(char **x)
 	    if (!strcmp(*p, *t)) {
 		zsfree(*p);
 		for (t = p--; (*t = t[1]) != NULL; t++);
-		changes++;
 		break;
 	    }
-    return changes;
 }
 
 /* Function to get value of special parameter `#' and `ARGC' */
@@ -2759,7 +2756,7 @@ pipestatsetfn(Param pm, char **x)
  * do the replacing, since we've already scanned for the string. */
 
 /**/
-static void
+void
 arrfixenv(char *s, char **t)
 {
     char **ep, *u;