Skip to content

[sys] Fix unicode paths on windows #316

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

Draft
tobil4sk wants to merge 6 commits into
base: master
Choose a base branch
from
+74 −9
Draft

[sys] Fix unicode paths on windows #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
393d267
[sys] Fix sys_read_dir unicode on windows
tobil4sk Dec 23, 2025
ef4f398
[sys] Fix sys_exists with unicode on windows
tobil4sk Dec 23, 2025
fbf4a99
[sys] Fix sys_file_type with unicode on windows
tobil4sk Dec 23, 2025
7f1577d
[sys] Fix sys_stat with unicode on windows
tobil4sk Dec 23, 2025
184ca92
[sys] Use conversion macro in sys_read_dir
tobil4sk Dec 23, 2025
5693323
[std] Fix file_open with unicode paths on windows
tobil4sk Dec 24, 2025
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
7 changes: 7 additions & 0 deletions libs/std/file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <stdio.h>
#ifdef NEKO_WINDOWS
# include <windows.h>
# include "win_api_strings.h"
#endif

/**
Expand Down Expand Up @@ -63,7 +64,13 @@ static value file_open( value name, value r ) {
val_check(r,string);
f = (fio*)alloc(sizeof(fio));
f->name = alloc_string(val_string(name));
#ifdef NEKO_WINDOWS
CONVERT_TO_WPATH(name,wide_path);
CONVERT_TO_WSTR(r, wide_r);
f->io = _wfopen(wide_path,wide_r);
#else
f->io = fopen(val_string(name),val_string(r));
#endif
if( f->io == NULL )
file_error("file_open",f);
return alloc_abstract(k_file,f);
Expand Down
50 changes: 41 additions & 9 deletions libs/std/sys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
# include <windows.h>
# include <direct.h>
# include <conio.h>
# include "win_api_strings.h"
#else
# include <errno.h>
# include <unistd.h>
Expand Down Expand Up @@ -295,9 +296,16 @@ static value sys_exit( value ecode ) {
<doc>Returns true if the file or directory exists.</doc>
**/
static value sys_exists( value path ) {
struct stat st;
val_check(path,string);
return alloc_bool(stat(val_string(path),&st) == 0);
#ifdef NEKO_WINDOWS
CONVERT_TO_WPATH(path, wide_path);
bool result = GetFileAttributesW(wide_path) != INVALID_FILE_ATTRIBUTES;
#else
struct stat st;
bool result = stat(val_string(path),&st) == 0;
#endif

return alloc_bool(result);
}

/**
Expand Down Expand Up @@ -351,10 +359,16 @@ static value sys_rename( value path, value newname ) {
<doc>Run the [stat] command on the given file or directory.</doc>
**/
static value sys_stat( value path ) {
struct stat s;
value o;
val_check(path,string);
#ifdef NEKO_WINDOWS
struct _stat s;
CONVERT_TO_WPATH(path, wide_path);
if( _wstat(wide_path,&s) != 0 )
#else
struct stat s;
if( stat(val_string(path),&s) != 0 )
#endif
neko_error();
o = alloc_object(NULL);
STATF(gid);
Expand Down Expand Up @@ -388,9 +402,15 @@ static value sys_stat( value path ) {
</doc>
**/
static value sys_file_type( value path ) {
struct stat s;
val_check(path,string);
#ifdef NEKO_WINDOWS
struct _stat s;
CONVERT_TO_WPATH(path, wide_path);
if( _wstat(wide_path,&s) != 0 )
#else
struct stat s;
if( stat(val_string(path),&s) != 0 )
#endif
neko_error();
if( s.st_mode & S_IFREG )
return alloc_string("file");
Expand Down Expand Up @@ -511,7 +531,7 @@ static value sys_read_dir( value path ) {
value h = val_null;
value cur = NULL, tmp;
#ifdef NEKO_WINDOWS
WIN32_FIND_DATA d;
WIN32_FIND_DATAW d;
HANDLE handle;
buffer b;
int len;
Expand All @@ -524,22 +544,34 @@ static value sys_read_dir( value path ) {
else
buffer_append(b,"*.*");
path = buffer_to_string(b);
handle = FindFirstFile(val_string(path),&d);
CONVERT_TO_WPATH(path, wide_path);
handle = FindFirstFileW(wide_path,&d);
if( handle == INVALID_HANDLE_VALUE )
neko_error();
while( true ) {
// skip magic dirs
if( d.cFileName[0] != '.' || (d.cFileName[1] != 0 && (d.cFileName[1] != '.' || d.cFileName[2] != 0)) ) {
if( d.cFileName[0] != L'.' || (d.cFileName[1] != 0 && (d.cFileName[1] != L'.' || d.cFileName[2] != 0)) ) {
tmp = alloc_array(2);
val_array_ptr(tmp)[0] = alloc_string(d.cFileName);
int len = WideCharToMultiByte(CP_UTF8, 0, d.cFileName, -1, NULL, 0, NULL, NULL);
if (len == 0) {
FindClose(handle);
neko_error();
}
value item = alloc_empty_string(len - 1);
len = WideCharToMultiByte(CP_UTF8, 0, d.cFileName, -1, val_string(item), len, NULL, NULL);
if (len == 0) {
FindClose(handle);
neko_error();
}
val_array_ptr(tmp)[0] = item;
val_array_ptr(tmp)[1] = val_null;
if( cur )
val_array_ptr(cur)[1] = tmp;
else
h = tmp;
cur = tmp;
}
if( !FindNextFile(handle,&d) )
if( !FindNextFileW(handle,&d) )
break;
}
FindClose(handle);
Expand Down
26 changes: 26 additions & 0 deletions libs/std/win_api_strings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#ifndef WIN_PATHS_H
#define WIN_PATHS_H

#include <malloc.h>

#define CONVERT_TO_WPATH(str, wpath) \
WCHAR wpath[MAX_PATH]; \
{ \
int result = MultiByteToWideChar(CP_UTF8, 0, val_string(str), val_strlen(str) + 1, wpath, MAX_PATH); \
if (result == 0) \
neko_error(); \
}

#define CONVERT_TO_WSTR(str, wstr) \
WCHAR* wstr; \
{ \
int wsize = MultiByteToWideChar(CP_UTF8, 0, val_string(str), val_strlen(str) + 1, NULL, 0); \
if (wsize == 0) \
neko_error(); \
wstr = alloca(sizeof(WCHAR) * wsize); \
int result = MultiByteToWideChar(CP_UTF8, 0, val_string(str), val_strlen(str) + 1, wstr, wsize); \
if (result == 0) \
neko_error(); \
}

#endif
Loading