From 5eb7174b0444f66169318d978dbf83a597d98148 Mon Sep 17 00:00:00 2001
From: tobil4sk <tobil4sk@outlook.com>
Date: Wed, 20 Oct 2021 20:32:38 +0100
Subject: [PATCH] Add null case to `put_env` function in sys (#233)

* Add null case to `put_env` function in sys

* Increment version number to 2.3.1
---
 CMakeLists.txt      |  2 +-
 azure-pipelines.yml |  2 +-
 libs/std/sys.c      | 20 ++++++++++++++------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 930c1ab6..96ee5229 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ endif()
 
 set(NEKO_VERSION_MAJOR 2)
 set(NEKO_VERSION_MINOR 3)
-set(NEKO_VERSION_PATCH 0)
+set(NEKO_VERSION_PATCH 1)
 set(NEKO_VERSION ${NEKO_VERSION_MAJOR}.${NEKO_VERSION_MINOR}.${NEKO_VERSION_PATCH})
 
 # Determine target endianness
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index fa438da1..7e9ab55d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -5,7 +5,7 @@ variables:
   - name: AZURE_PIPELINES_BRANCH
     value: $(Build.SourceBranchName)
   - name: NEKO_VERSION
-    value: "2.3.0"
+    value: "2.3.1"
 
 trigger:
   branches:
diff --git a/libs/std/sys.c b/libs/std/sys.c
index 1a7ce00e..55b0ff1e 100644
--- a/libs/std/sys.c
+++ b/libs/std/sys.c
@@ -85,20 +85,28 @@ static value get_env( value v ) {
 	<doc>Set some environment variable value</doc>
 **/
 static value put_env( value e, value v ) {
+	val_check(e,string);
+	bool is_null = val_is_null(v);
 #ifdef NEKO_WINDOWS
 	buffer b;
-	val_check(e,string);
-	val_check(v,string);
+	if( !is_null )
+		val_check(v,string);
 	b = alloc_buffer(NULL);
 	val_buffer(b,e);
 	buffer_append_sub(b,"=",1);
-	val_buffer(b,v);
+	if( !is_null )
+		val_buffer(b,v);
 	if( putenv(val_string(buffer_to_string(b))) != 0 )
 		neko_error();
 #else
-	val_check(e,string);
-	val_check(v,string);
-	if( setenv(val_string(e),val_string(v),1) != 0 )
+	int result;
+	if( is_null )
+		result = unsetenv(val_string(e));
+	else {
+		val_check(v,string);
+		result = setenv(val_string(e),val_string(v),1);
+	}
+	if( result != 0 )
 		neko_error();
 #endif
 	return val_true;