Fix new package path

core/path/path.odin

@@ -12,9 +12,9 @@ dir :: proc(path: string, new := false, allocator := context.allocator) -> strin
 		if path[i] == '/' || path[i] == '\\' {
 			if path[:i] == "" {
 				// path is root
-                return new ? strings.new_string(SEPARATOR_STRING, allocator) : SEPARATOR_STRING;
+				return new ? strings.clone(SEPARATOR_STRING, allocator) : SEPARATOR_STRING;
 			} else {
-                return new ? strings.new_string(path[:i], allocator) : path[:i];
+				return new ? strings.clone(path[:i], allocator) : path[:i];
 			}
 		}
 	}
@@ -33,7 +33,7 @@ base :: proc(path: string, new := false, allocator := context.allocator) -> stri
 		switch path[i] {
 		case '/', '\\':
 			if i != end {
-                return new ? strings.new_string(path[i+1:], allocator) : path[i+1:];
+				return new ? strings.clone(path[i+1:], allocator) : path[i+1:];
 			} else {
 				end = i; // we don't want trailing slashes
 			}
@@ -41,7 +41,7 @@ base :: proc(path: string, new := false, allocator := context.allocator) -> stri
 	}
 
 	// path doesn't contain any folder structure, return entire path
-    return new ? strings.new_string(path, allocator) : path;
+	return new ? strings.clone(path, allocator) : path;
 }
 
 // returns the final path element, excluding the file extension if there is one
@@ -54,12 +54,12 @@ name :: proc(path: string, new := false, allocator := context.allocator) -> stri
 	for i := end; i >= 0; i -= 1 {
 		switch path[i] {
 		case '.':       dot = (dot == end ? i : dot);
-        case '/', '\\': return new ? strings.new_string(path[i+1:dot], allocator) : path[i+1:dot];
+		case '/', '\\': return new ? strings.clone(path[i+1:dot], allocator) : path[i+1:dot];
 		}
 	}
 
 	// path doesn't contain any folder structure or file extensions; assumed to be a valid file name
-    return new ? strings.new_string(path, allocator) : path;
+	return new ? strings.clone(path, allocator) : path;
 }
 
 // returns the file extension, if there is one
@@ -69,7 +69,7 @@ ext :: proc(path: string, new := false, allocator := context.allocator) -> strin
 	for i := len(path)-1; i >= 0; i -= 1 {
 		switch path[i] {
 		case '/', '\\': return "";
-        case '.':       return new ? strings.new_string(path[i+1:], allocator) : path[i+1:];
+		case '.':       return new ? strings.clone(path[i+1:], allocator) : path[i+1:];
 		}
 	}
 
@@ -84,6 +84,7 @@ rel :: proc{rel_between, rel_current};
 rel_between :: proc(from, to: string, allocator := context.allocator) -> string {
 	if from == "" || to == "" do return "";
 
+	from, to := from, to;
 	from = full(from, context.temp_allocator);
 	to   = full(to,   context.temp_allocator);
 
@@ -123,7 +124,7 @@ rel_between :: proc(from, to: string, allocator := context.allocator) -> string
 
 	if slash < 1 {
 		// there is no common path, use the absolute `to` path
-        return strings.new_string(to, allocator);
+		return strings.clone(to, allocator);
 	}
 
 	from_slashes, to_slashes := 0, 0;
@@ -167,20 +168,20 @@ rel_between :: proc(from, to: string, allocator := context.allocator) -> string
 
 		buffer[0] = '.';
 		buffer[1] = SEPARATOR;
-        copy(buffer[2:], ([]byte)(to));
+		copy(buffer[2:], to);
 
 		return string(buffer);
 	}
 	else {
 		buffer := make([]byte, from_slashes*3 + len(to), allocator);
 
-        for i in 0..from_slashes-1 {
+		for i in 0..<from_slashes {
 			buffer[i*3+0] = '.';
 			buffer[i*3+1] = '.';
 			buffer[i*3+2] = SEPARATOR;
 		}
 
-        copy(buffer[from_slashes*3:], ([]byte)(to));
+		copy(buffer[from_slashes*3:], to);
 
 		return string(buffer);
 	}
@@ -189,12 +190,12 @@ rel_between :: proc(from, to: string, allocator := context.allocator) -> string
 }
 
 // returns the relative path from the current directory to another path
-rel_current :: proc(to: string, allocator := context.temp_allocator) -> string {
+rel_current :: proc(to: string, allocator := context.allocator) -> string {
-    return inline rel_between(current(context.temp_allocator), to, allocator);
+	return rel_between(current(context.allocator), to, allocator);
 }
 
 
 // splits the path elements into slices of the original path string
-split :: proc(s: string, allocator := context.temp_allocator) -> []string #no_bounds_check {
+split :: proc(s: string, allocator := context.allocator) -> []string {
-    return inline strings.split(s, []string{"\\", "/"}, true, allocator);
+	return strings.split_multi(s, []string{"\\", "/"}, true, allocator);
 }

core/path/path_linux.odin

@@ -1,80 +0,0 @@
-package path
-
-foreign import libc "system:c"
-
-import "core:os"
-import "core:strings"
-
-
-MAX :: 4096; // @note(bp): apparently PATH_MAX is bullshit
-
-SEPARATOR        :: '/';
-SEPARATOR_STRING :: "/";
-
-
-@(private)
-null_term :: proc(str: string) -> string {
-    for c, i in str {
-        if c == '\x00' {
-            return str[:i];
-        }
-    }
-    return str;
-}
-
-
-full :: proc(path: string, allocator := context.temp_allocator) -> string {
-    cpath := strings.clone_to_cstring(path, context.temp_allocator);
-    
-    foreign libc {
-        realpath :: proc(path: cstring, resolved_path: ^u8) -> cstring ---;
-    }
-
-    buf := make([dynamic]u8, MAX, MAX, allocator);
-
-    cstr := realpath(cpath, &buf[0]);
-    for cstr == nil && os.get_last_error() == int(os.ENAMETOOLONG) {
-        resize(&buf, len(buf) + MAX);
-        cstr = realpath(cpath, &buf[0]);
-    }
-
-    return null_term(string(buf[:]));
-}
-
-current :: proc(allocator := context.temp_allocator) -> string {
-    foreign libc{
-        getcwd :: proc(buf: ^u8, size: int) -> cstring ---;
-    }
-
-    buf := make([dynamic]u8, MAX, MAX, allocator);
-
-    cstr := getcwd(&buf[0], len(buf));
-    for cstr == nil && os.get_last_error() == int(os.ENAMETOOLONG) {
-        resize(&buf, len(buf) + MAX);
-        cstr = getcwd(&buf[0], len(buf));
-    }
-
-    return null_term(string(buf[:]));
-}
-
-
-exists :: proc(path: string) -> bool {
-    if _, err := os.stat(path); err != os.ERROR_NONE {
-        return true;
-    }
-    return false;
-}
-
-is_dir :: proc(path: string) -> bool {
-    if stat, err := os.stat(path); err == os.ERROR_NONE {
-        return os.S_ISDIR(stat.mode);
-    }
-    return false;
-}
-
-is_file :: proc(path: string) -> bool {
-    if stat, err := os.stat(path); err == os.ERROR_NONE {
-        return os.S_ISREG(stat.mode);
-    }
-    return false;
-}

core/path/path_windows.odin

@@ -1,7 +1,7 @@
 package path
 
 import "core:strings"
-import "core:sys/win32"
+import win32 "core:sys/windows"
 
 
 SEPARATOR        :: '\\';
@@ -9,7 +9,7 @@ SEPARATOR_STRING :: "\\";
 
 
 @(private)
-null_term :: proc"contextless"(str: string) -> string {
+null_term :: proc "contextless" (str: string) -> string {
 	for c, i in str {
 		if c == '\x00' {
 			return str[:i];
@@ -21,59 +21,59 @@ null_term :: proc"contextless"(str: string) -> string {
 
 long :: proc(path: string, allocator := context.temp_allocator) -> string {
 	c_path := win32.utf8_to_wstring(path, context.temp_allocator);
-    length := win32.get_long_path_name_w(c_path, nil, 0);
+	length := win32.GetLongPathNameW(c_path, nil, 0);
 
 	if length == 0 do return "";
 
 	buf := make([]u16, length, context.temp_allocator);
 
-    win32.get_long_path_name_w(c_path, win32.Wstring(&buf[0]), length);
+	win32.GetLongPathNameW(c_path, win32.LPCWSTR(&buf[0]), length);
 
-    res := win32.ucs2_to_utf8(buf[:length], allocator);
+	res := win32.utf16_to_utf8(buf[:length], allocator);
 
 	return null_term(res);
 }
 
 short :: proc(path: string, allocator := context.temp_allocator) -> string {
 	c_path := win32.utf8_to_wstring(path, context.temp_allocator);
-    length := win32.get_short_path_name_w(c_path, nil, 0);
+	length := win32.GetShortPathNameW(c_path, nil, 0);
 
 	if length == 0 do return "";
 
 	buf := make([]u16, length, context.temp_allocator);
 
-    win32.get_short_path_name_w(c_path, win32.Wstring(&buf[0]), length);
+	win32.GetShortPathNameW(c_path, win32.LPCWSTR(&buf[0]), length);
 
-    res := win32.ucs2_to_utf8(buf[:length], allocator);
+	res := win32.utf16_to_utf8(buf[:length], allocator);
 
 	return null_term(res);
 }
 
 full :: proc(path: string, allocator := context.temp_allocator) -> string {
 	c_path := win32.utf8_to_wstring(path, context.temp_allocator);
-    length := win32.get_full_path_name_w(c_path, 0, nil, nil);
+	length := win32.GetFullPathNameW(c_path, 0, nil, nil);
 
 	if length == 0 do return "";
 
 	buf := make([]u16, length, context.temp_allocator);
 
-    win32.get_full_path_name_w(c_path, length, win32.Wstring(&buf[0]), nil);
+	win32.GetFullPathNameW(c_path, length, win32.LPCWSTR(&buf[0]), nil);
 
-    res := win32.ucs2_to_utf8(buf[:length], allocator);
+	res := win32.utf16_to_utf8(buf[:length], allocator);
 
 	return null_term(res);
 }
 
 current :: proc(allocator := context.temp_allocator) -> string {
-    length := win32.get_current_directory_w(0, nil);
+	length := win32.GetCurrentDirectoryW(0, nil);
 
 	if length == 0 do return "";
 
 	buf := make([]u16, length, context.temp_allocator);
 
-    win32.get_current_directory_w(length, win32.Wstring(&buf[0]));
+	win32.GetCurrentDirectoryW(length, win32.LPCWSTR(&buf[0]));
 
-    res := win32.ucs2_to_utf8(buf[:length], allocator);
+	res := win32.utf16_to_utf8(buf[:length], allocator);
 
 	return strings.trim_null(res);
 }
@@ -81,21 +81,21 @@ current :: proc(allocator := context.temp_allocator) -> string {
 
 exists :: proc(path: string) -> bool {
 	c_path  := win32.utf8_to_wstring(path, context.temp_allocator);
-    attribs := win32.get_file_attributes_w(c_path);
+	attribs := win32.GetFileAttributesW(c_path);
 
 	return i32(attribs) != win32.INVALID_FILE_ATTRIBUTES;
 }
 
 is_dir :: proc(path: string) -> bool {
 	c_path  := win32.utf8_to_wstring(path, context.temp_allocator);
-    attribs := win32.get_file_attributes_w(c_path);
+	attribs := win32.GetFileAttributesW(c_path);
 
 	return (i32(attribs) != win32.INVALID_FILE_ATTRIBUTES) && (attribs & win32.FILE_ATTRIBUTE_DIRECTORY == win32.FILE_ATTRIBUTE_DIRECTORY);
 }
 
 is_file :: proc(path: string) -> bool {
 	c_path  := win32.utf8_to_wstring(path, context.temp_allocator);
-    attribs := win32.get_file_attributes_w(c_path);
+	attribs := win32.GetFileAttributesW(c_path);
 
 	return (i32(attribs) != win32.INVALID_FILE_ATTRIBUTES) && (attribs & win32.FILE_ATTRIBUTE_DIRECTORY != win32.FILE_ATTRIBUTE_DIRECTORY);
 }
@@ -106,7 +106,7 @@ drive :: proc(path: string, new := false, allocator := context.allocator) -> str
 		letter := path[:2];
 
 		if path[1] == ':' && (path[2] == '\\' || path[2] == '/') {
-            return new ? strings.new_string(path[:2], allocator) : path[:2];
+			return new ? strings.clone(path[:2], allocator) : path[:2];
 		}
 	}
 

core/strings/strings.odin

@@ -655,76 +655,7 @@ trim_null :: proc(s: string) -> string {
 }
 
 
-// returns a slice of sub-strings into `s`
+split_multi :: proc(s: string, substrs: []string, skip_empty := false, allocator := context.allocator) -> []string #no_bounds_check {
-// `allocator` is used only for the slice
-// `skip_empty=true` does not return zero-length substrings
-split :: proc{split_single, split_multi};
-
-split_single :: proc(s, substr: string, skip_empty := false, allocator := context.temp_allocator) -> []string #no_bounds_check {
-    if s == "" || substr == "" do return nil;
-
-    sublen := len(substr);
-    shared := len(s) - sublen;
-
-    if shared <= 0 {
-        return nil;
-    }
-
-    // number, index, last
-    n, i, l := 0, 0, 0;
-
-    // count results
-	first_pass: for i <= shared {
-        if s[i:i+sublen] == substr {
-            if !skip_empty || i - l > 0 {
-                n += 1;
-            }
-
-            i += sublen;
-            l  = i;
-        } else {
-            _, skip := utf8.decode_rune_in_string(s[i:]);
-            i += skip;
-        }
-    }
-
-    if !skip_empty || len(s) - l > 0 { 
-        n += 1;
-    }
-
-    if n < 1 {
-    	// no results
-        return nil;
-    }
-
-    buf := make([]string, n, allocator);
-
-    n, i, l = 0, 0, 0;
-
-    // slice results
-    second_pass: for i <= shared {
-        if s[i:i+sublen] == substr {
-            if !skip_empty || i - l > 0 {
-                buf[n] = s[l:i];
-                n += 1;
-            }
-
-            i += sublen;
-            l  = i;
-        } else {
-            _, skip := utf8.decode_rune_in_string(s[i:]);
-            i += skip;
-        }
-    }
-
-    if !skip_empty || len(s) - l > 0 {
-        buf[n] = s[l:];
-    }
-
-    return buf;
-}
-
-split_multi :: proc(s: string, substrs: []string, skip_empty := false, allocator := context.temp_allocator) -> []string #no_bounds_check {
 	if s == "" || len(substrs) <= 0 {
 		return nil;
 	}

core/sys/windows/kernel32.odin

@@ -259,6 +259,7 @@ foreign kernel32 {
 	GetFileType :: proc(file_handle: HANDLE) -> DWORD ---
 	SetFilePointer :: proc(file_handle: HANDLE, distance_to_move: LONG, distance_to_move_high: ^LONG, move_method: DWORD) -> DWORD ---
 	GetFileSizeEx :: proc(file_handle: HANDLE, file_size: ^LARGE_INTEGER) -> BOOL ---
+	GetFileAttributesW   :: proc(lpFileName: LPCWSTR) -> DWORD ---
 	GetFileAttributesExW :: proc(lpFileName: LPCWSTR, fInfoLevelId: GET_FILEEX_INFO_LEVELS, lpFileInformation: LPVOID) -> BOOL ---
 	GetSystemInfo :: proc(system_info: ^SYSTEM_INFO) ---
 	GetVersionExW :: proc(osvi: ^OSVERSIONINFOEXW) ---
@@ -266,4 +267,10 @@ foreign kernel32 {
 	LoadLibraryW :: proc(c_str: LPCWSTR) -> HMODULE ---
 	FreeLibrary :: proc(h: HMODULE) -> BOOL ---
 	GetProcAddress :: proc(h: HMODULE, c_str: LPCSTR) -> rawptr ---
+
+
+	GetFullPathNameW  :: proc(filename: LPCWSTR, buffer_length: DWORD, buffer: LPCWSTR, file_part: ^LPCWSTR) -> DWORD ---
+	GetLongPathNameW  :: proc(short, long: LPCWSTR, len: DWORD) -> DWORD ---
+	GetShortPathNameW :: proc(long, short: LPCWSTR, len: DWORD) -> DWORD ---
+
 }