summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2007-11-23 02:32:56 +0000
committerBart Schaefer <barts@users.sourceforge.net>2007-11-23 02:32:56 +0000
commit1b363034ce431c463646c40c9245b011e2f940ee (patch)
tree9e785ac38b0e31260cf774ff5b24e85319f35616
parenta5dd64f024524b987694b25c0225d4755860d748 (diff)
downloadzsh-1b363034ce431c463646c40c9245b011e2f940ee.tar.gz
zsh-1b363034ce431c463646c40c9245b011e2f940ee.tar.xz
zsh-1b363034ce431c463646c40c9245b011e2f940ee.zip
24113: createparamtable() was still messing with
the internals of the environment even when USE_SET_UNSET_ENV.
-rw-r--r--ChangeLog5
-rw-r--r--Src/params.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a5bdc0f64..ab897d237 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,11 @@
 	* 24114: Completion/Unix/Command/_git: make colon suffix removable
 	after the first part of refspecs.
 
+2007-11-22  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 24113: Src/params.c: createparamtable() was still messing with
+	the internals of the environment even when USE_SET_UNSET_ENV.
+
 2007-11-21  Clint Adams  <clint@zsh.org>
 
 	* arno.: 24111: Completion/Debian/Command/_dlocate: complete -lsbin
diff --git a/Src/params.c b/Src/params.c
index 993eaa097..0fe1a6dd8 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -692,13 +692,17 @@ createparamtable(void)
 					    getsparam(pm->node.nam), pm->node.flags);
 		    else
 			pm->env = ztrdup(*envp2);
+#ifndef USE_SET_UNSET_ENV
 		    *envp++ = pm->env;
+#endif
 		}
 	    }
 	}
     }
     popheap();
+#ifndef USE_SET_UNSET_ENV
     *envp = '\0';
+#endif
     opts[ALLEXPORT] = oae;
 
     if (emulation == EMULATE_ZSH)