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

normalize_path

Browse Source
This commit is contained in:
Thomas la Cour
2024-04-20 09:37:30 +02:00
parent 3620e62ff7
commit 0a16f7a6f1
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/build_settings.cpp
+2 -4
View File
@@ -840,13 +840,11 @@ gb_internal String odin_root_dir(void) {
char const *found = gb_get_env("ODIN_ROOT", a); char const *found = gb_get_env("ODIN_ROOT", a);
if (found) { if (found) {
String path = path_to_full_path(a, make_string_c(found)); String path = path_to_full_path(a, make_string_c(found));
if (path[path.len-1] != '/' && path[path.len-1] != '\\') {
#if defined(GB_SYSTEM_WINDOWS) #if defined(GB_SYSTEM_WINDOWS)
path = concatenate_strings(a, path, WIN32_SEPARATOR_STRING); path = normalize_path(a, path, WIN32_SEPARATOR_STRING);
#else #else
path = concatenate_strings(a, path, NIX_SEPARATOR_STRING); path = normalize_path(a, path, NIX_SEPARATOR_STRING);
#endif #endif
}
global_module_path = path; global_module_path = path;
global_module_path_set = true; global_module_path_set = true;
src/string.cpp
+28 -6
View File
@@ -237,11 +237,16 @@ gb_internal String string_split_iterator(String_Iterator *it, const char sep) {
return substring(it->str, start, end); return substring(it->str, start, end);
} }
gb_internal gb_inline bool is_separator(u8 const &ch) {
return (ch == '/' || ch == '\\');
}
gb_internal gb_inline isize string_extension_position(String const &str) { gb_internal gb_inline isize string_extension_position(String const &str) {
isize dot_pos = -1; isize dot_pos = -1;
isize i = str.len; isize i = str.len;
while (i --> 0) { while (i --> 0) {
if (str[i] == '\\' || str[i] == '/') if (is_separator(str[i]))
break; break;
if (str[i] == '.') { if (str[i] == '.') {
dot_pos = i; dot_pos = i;
@@ -332,8 +337,7 @@ gb_internal String filename_from_path(String s) {
if (i > 0) { if (i > 0) {
isize j = 0; isize j = 0;
for (j = s.len-1; j >= 0; j--) { for (j = s.len-1; j >= 0; j--) {
if (s[j] == '/' || if (is_separator(s[j])) {
s[j] == '\\') {
break; break;
} }
} }
@@ -346,8 +350,7 @@ gb_internal String filename_from_path(String s) {
gb_internal String filename_without_directory(String s) { gb_internal String filename_without_directory(String s) {
isize j = 0; isize j = 0;
for (j = s.len-1; j >= 0; j--) { for (j = s.len-1; j >= 0; j--) {
if (s[j] == '/' || if (is_separator(s[j])) {
s[j] == '\\') {
break; break;
} }
} }
@@ -410,7 +413,26 @@ gb_internal String copy_string(gbAllocator a, String const &s) {
return make_string(data, s.len); return make_string(data, s.len);
} }
gb_internal String normalize_path(gbAllocator a, String const &path, String const &sep) {
String s;
if (sep.len < 1) {
return path;
}
if (path.len < 1) {
s = STR_LIT("");
} else if (is_separator(path[path.len-1])) {
s = copy_string(a, path);
} else {
s = concatenate_strings(a, path, sep);
}
isize i;
for (i = 0; i < s.len; i++) {
if (is_separator(s.text[i])) {
s.text[i] = sep.text[0];
}
}
return s;
}
#if defined(GB_SYSTEM_WINDOWS) #if defined(GB_SYSTEM_WINDOWS)