Merge branch 'obsd-master'

Conflicts:
	tmux.h

1 files changed, 9 insertions, 16 deletions

diff --git a/environ.c b/environ.c
index 0dd91783..11b8c849 100644
--- a/environ.c
+++ b/environ.c
@@ -157,23 +157,16 @@ environ_update(const char *vars, struct environ *srcenv,
 void
 environ_push(struct environ *env)
 {
-	ARRAY_DECL(, char *)	varlist;
-	struct environ_entry   *envent;
-	char		      **varp, *var;
-	u_int			i;
-
-	ARRAY_INIT(&varlist);
-	for (varp = environ; *varp != NULL; varp++) {
-		var = xstrdup(*varp);
-		var[strcspn(var, "=")] = '\0';
-		ARRAY_ADD(&varlist, var);
-	}
-	for (i = 0; i < ARRAY_LENGTH(&varlist); i++) {
-		var = ARRAY_ITEM(&varlist, i);
-		unsetenv(var);
-		free(var);
+	struct environ_entry	 *envent;
+	char			**vp, *v;
+
+	for (vp = environ; *vp != NULL; vp++) {
+		v = xstrdup(*vp);
+		v[strcspn(v, "=")] = '\0';
+
+		unsetenv(v);
+		free(v);
 	}
-	ARRAY_FREE(&varlist);
 
 	RB_FOREACH(envent, environ, env) {
 		if (envent->value != NULL)