ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

set the correct allocators and ignore the previous and parent directory in readdir.

Browse Source
This commit is contained in:
DanielGavin
2021-02-12 23:22:53 +01:00
parent 5cced38a6e
commit 0f11c47579
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os/dir_linux.odin
+11 -7
View File
@@ -28,7 +28,7 @@ read_dir :: proc(fd: Handle, n: int, allocator := context.allocator) -> (fi: []F
size = 100;
}
dfi := make([dynamic]File_Info, 0, size);
dfi := make([dynamic]File_Info, 0, size, allocator);
for {
entry: Dirent;
@@ -36,7 +36,7 @@ read_dir :: proc(fd: Handle, n: int, allocator := context.allocator) -> (fi: []F
entry, err, end_of_stream = _readdir(dirp);
if err != ERROR_NONE {
for fi_ in dfi {
file_info_delete(fi_);
file_info_delete(fi_, allocator);
}
delete(dfi);
return;
@@ -45,15 +45,19 @@ read_dir :: proc(fd: Handle, n: int, allocator := context.allocator) -> (fi: []F
}
fi_: File_Info;
filename := cast(string)(transmute(cstring)mem.Raw_Cstring{ data = &entry.name[0] });
fullpath := strings.join( []string{ dirpath, filename }, "/" );
defer delete(fullpath);
fi_, err = stat(fullpath);
if filename == "." || filename == ".." {
continue;
}
fullpath := strings.join( []string{ dirpath, filename }, "/", context.temp_allocator);
defer delete(fullpath, context.temp_allocator);
fi_, err = stat(fullpath, allocator);
if err != ERROR_NONE {
for fi__ in dfi {
file_info_delete(fi__);
file_info_delete(fi__, allocator);
}
delete(dfi);
return;