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

Temporary fix for an Odin bug.

Browse Source
This commit is contained in:
Zachary Pierson
2017-02-11 18:54:54 -06:00
parent fc1a006de1
commit 3f3122bccc
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os_linux.odin
+3 -3
View File
@@ -71,8 +71,8 @@ from_c_str :: proc(c_str: ^u8) -> string {
} }
return cast(string)slice_ptr(c_str, len); return cast(string)slice_ptr(c_str, len);
} }
// TODO(zangent): Change this to just `open` when Bill fixes overloading.
open :: proc(path: string, mode: int) -> (Handle, Errno) { open_simple :: proc(path: string, mode: int) -> (Handle, Errno) {
handle := unix_open(to_c_str(path), mode); handle := unix_open(to_c_str(path), mode);
if(handle == -1) { if(handle == -1) {
@@ -132,7 +132,7 @@ last_write_time_by_name :: proc(name: string) -> File_Time {}
read_entire_file :: proc(name: string) -> ([]byte, bool) { read_entire_file :: proc(name: string) -> ([]byte, bool) {
handle, err := open(name, O_RDONLY); handle, err := open_simple(name, O_RDONLY);
if(err != 0) { if(err != 0) {
fmt.println("Failed to open file."); fmt.println("Failed to open file.");
return nil, false; return nil, false;
core/os_x.odin
+7 -5
View File
@@ -74,8 +74,8 @@ from_c_str :: proc(c_str: ^u8) -> string {
} }
return cast(string)slice_ptr(c_str, len); return cast(string)slice_ptr(c_str, len);
} }
// TODO(zangent): Change this to just `open` when Bill fixes overloading.
open :: proc(path: string, mode: int) -> (Handle, Errno) { open_simple :: proc(path: string, mode: int) -> (Handle, Errno) {
handle := unix_open(to_c_str(path), mode); handle := unix_open(to_c_str(path), mode);
if(handle == -1) { if(handle == -1) {
@@ -83,9 +83,10 @@ open :: proc(path: string, mode: int) -> (Handle, Errno) {
} }
return handle, 0; return handle, 0;
} }
// NOTE(zangent): This is here for compatability reasons. Should this be here? // NOTE(zangent): This is here for compatability reasons. Should this be here?
open :: proc(path: string, mode: int, perm: u32) -> (Handle, Errno) { open :: proc(path: string, mode: int, perm: u32) -> (Handle, Errno) {
return open(path, mode); return open_simple(path, mode);
} }
close :: proc(fd: Handle) { close :: proc(fd: Handle) {
@@ -132,10 +133,10 @@ stderr: Handle = 2; // get_std_handle(win32.STD_ERROR_HANDLE);
last_write_time :: proc(fd: Handle) -> File_Time {} last_write_time :: proc(fd: Handle) -> File_Time {}
last_write_time_by_name :: proc(name: string) -> File_Time {} last_write_time_by_name :: proc(name: string) -> File_Time {}
*/ */
/*
read_entire_file :: proc(name: string) -> ([]byte, bool) { read_entire_file :: proc(name: string) -> ([]byte, bool) {
handle, err := open(name, O_RDONLY); handle, err := open_simple(name, O_RDONLY);
if(err != 0) { if(err != 0) {
fmt.println("Failed to open file."); fmt.println("Failed to open file.");
return nil, false; return nil, false;
@@ -178,6 +179,7 @@ read_entire_file_to_string :: proc(name: string) -> (string, bool) {
} }
return from_c_str(^contents[0]), true; return from_c_str(^contents[0]), true;
} }
*/
heap_alloc :: proc(size: int) -> rawptr #inline { heap_alloc :: proc(size: int) -> rawptr #inline {
assert(size > 0); assert(size > 0);