From 409d984c3c35a233e25b7e3e90e563bf83e9c3b3 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Wed, 9 Apr 2008 16:57:21 -0500
Subject: [PATCH] move os_env from run to os-unix.c/os-windows.c

---
 vm/os-unix.c    | 10 ++++++++++
 vm/os-windows.c | 21 ++++++++++++++++++---
 vm/run.c        | 10 ----------
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/vm/os-unix.c b/vm/os-unix.c
index 2991cde78c..6363ce68a9 100755
--- a/vm/os-unix.c
+++ b/vm/os-unix.c
@@ -85,6 +85,16 @@ DEFINE_PRIMITIVE(read_dir)
 	dpush(result);
 }
 
+DEFINE_PRIMITIVE(os_env)
+{
+	char *name = unbox_char_string();
+	char *value = getenv(name);
+	if(value == NULL)
+		dpush(F);
+	else
+		box_char_string(value);
+}
+
 DEFINE_PRIMITIVE(os_envs)
 {
 	GROWABLE_ARRAY(result);
diff --git a/vm/os-windows.c b/vm/os-windows.c
index 77a32f6f9f..136168807a 100755
--- a/vm/os-windows.c
+++ b/vm/os-windows.c
@@ -215,19 +215,34 @@ void sleep_millis(DWORD msec)
 	Sleep(msec);
 }
 
+DEFINE_PRIMITIVE(os_env)
+{
+	F_CHAR *key = unbox_u16_string();
+	F_CHAR *value = safe_malloc(MAX_UNICODE_PATH);
+	int ret;
+	ret = GetEnvironmentVariable(key, value, MAX_UNICODE_PATH);
+	if(ret == 0)
+		dpush(F);
+	else
+		dpush(tag_object(from_u16_string(value)));
+	free(value);
+}
+
 DEFINE_PRIMITIVE(set_os_env)
 {
 	F_CHAR *key = unbox_u16_string();
 	REGISTER_C_STRING(key);
 	F_CHAR *value = unbox_u16_string();
 	UNREGISTER_C_STRING(key);
-	SetEnvironmentVariable(key, value);
+	if(!SetEnvironmentVariable(key, value))
+		general_error(ERROR_IO, tag_object(get_error_message()), F, NULL);
 }
 
 DEFINE_PRIMITIVE(unset_os_env)
 {
-	F_CHAR *key = unbox_u16_string();
-	SetEnvironmentVariable(key, NULL);
+	if(!SetEnvironmentVariable(unbox_u16_string(), NULL)
+		&& GetLastError() != ERROR_ENVVAR_NOT_FOUND)
+		general_error(ERROR_IO, tag_object(get_error_message()), F, NULL);
 }
 
 DEFINE_PRIMITIVE(set_os_envs)
diff --git a/vm/run.c b/vm/run.c
index 282be0a447..ae0c91d9e6 100755
--- a/vm/run.c
+++ b/vm/run.c
@@ -280,16 +280,6 @@ DEFINE_PRIMITIVE(exit)
 	exit(to_fixnum(dpop()));
 }
 
-DEFINE_PRIMITIVE(os_env)
-{
-	char *name = unbox_char_string();
-	char *value = getenv(name);
-	if(value == NULL)
-		dpush(F);
-	else
-		box_char_string(value);
-}
-
 DEFINE_PRIMITIVE(eq)
 {
 	CELL lhs = dpop();