1 files changed, 80 insertions, 1 deletions

diff --git a/str_array.c b/str_array.c
index 460e2f1d..f66b22cc 100644
--- a/str_array.c
+++ b/str_array.c
@@ -70,6 +70,25 @@ afunc_t str_array_func[] = {
 	(afunc_t) 0,
 };
 
+static NODE **env_remove(NODE *symbol, NODE *subs);
+static NODE **env_store(NODE *symbol, NODE *subs);
+static NODE **env_clear(NODE *symbol, NODE *subs);
+
+/* special case for ENVIRON */
+afunc_t env_array_func[] = {
+	str_array_init,
+	(afunc_t) 0,
+	null_length,
+	str_lookup,
+	str_exists,
+	env_clear,
+	env_remove,
+	str_list,
+	str_copy,
+	str_dump,
+	env_store,
+};
+
 static inline NODE **str_find(NODE *symbol, NODE *s1, size_t code1, unsigned long hash1);
 static void grow_table(NODE *symbol);
 
@@ -149,7 +168,7 @@ str_lookup(NODE *symbol, NODE *subs)
 	 * flag on it since other variables could be using the same
 	 * reference-counted value.
 	 */
-	if (subs->stfmt != -1 || (subs->flags & MAYBE_NUM) != 0) {
+	if (subs->stfmt != STFMT_UNUSED || (subs->flags & MAYBE_NUM) != 0) {
 		NODE *tmp;
 
 		/*
@@ -751,3 +770,63 @@ scramble(unsigned long x)
 
 	return x;
 }
+
+/* env_remove --- for ENVIRON, remove value from real environment */
+
+static NODE **
+env_remove(NODE *symbol, NODE *subs)
+{
+	NODE **val = str_remove(symbol, subs);
+
+	if (val != NULL)
+		(void) unsetenv(subs->stptr);
+
+	return val;
+}
+
+/* env_clear --- clear out the environment when ENVIRON is deleted */
+
+static NODE **
+env_clear(NODE *symbol, NODE *subs)
+{
+	extern char **environ;
+	NODE **val = str_clear(symbol, subs);
+
+	environ = NULL;	/* ZAP! */
+
+	/* str_clear zaps the vtable, reset it */
+	symbol->array_funcs = env_array_func;
+
+	return val;
+}
+
+/* env_store --- post assign function for ENVIRON, put new value into env */
+
+static NODE **
+env_store(NODE *symbol, NODE *subs)
+{
+	NODE **val = str_exists(symbol, subs);
+	const char *newval;
+
+	assert(val != NULL);
+
+	newval = (*val)->stptr;
+	if (newval == NULL)
+		newval = "";
+
+	(void) setenv(subs->stptr, newval, 1);
+
+	return val;
+}
+
+/* init_env_array --- set up the pointers for ENVIRON. A bit hacky. */
+
+void
+init_env_array(NODE *env_node)
+{
+	/* If POSIX simply don't reset the vtable and things work as before */
+	if (do_posix)
+		return;
+
+	env_node->array_funcs = env_array_func;
+}