From 772b3b7a06ceba64933cb3a9dfff61e56c229a74 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 23 Apr 2019 20:36:55 +0000
Subject: Indicate an array option with a flag rather than a special type so
 that in future will not have to be strings.

---
 environ.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'environ.c')

diff --git a/environ.c b/environ.c
index 2764e027..301c4f29 100644
--- a/environ.c
+++ b/environ.c
@@ -177,20 +177,20 @@ environ_update(struct options *oo, struct environ *src, struct environ *dst)
 	struct environ_entry		*envent;
 	struct options_entry		*o;
 	struct options_array_item	*a;
-	const char			*value;
+	union options_value		*ov;
 
 	o = options_get(oo, "update-environment");
 	if (o == NULL)
 		return;
 	a = options_array_first(o);
 	while (a != NULL) {
-		value = options_array_item_value(a);
-		if (value == NULL) {
+		ov = options_array_item_value(a);
+		if (ov == NULL) {
 			a = options_array_next(a);
 			continue;
 		}
-		if ((envent = environ_find(src, value)) == NULL)
-			environ_clear(dst, value);
+		if ((envent = environ_find(src, ov->string)) == NULL)
+			environ_clear(dst, ov->string);
 		else
 			environ_set(dst, envent->name, "%s", envent->value);
 		a = options_array_next(a);
-- 
cgit