Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add null case to put_env function in sys #233

Merged
merged 2 commits into from
Oct 20, 2021
Merged

Add null case to put_env function in sys #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32e114c
Add null case to `put_env` function in sys
tobil4sk Oct 20, 2021
c762658
Increment version number to 2.3.1
tobil4sk Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
20 changes: 14 additions & 6 deletions libs/std/sys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down