From 3c5124ce68110b780f9cd5aaa3801f1f200b98fe Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 24 May 2022 13:55:39 +0200 Subject: [PATCH] Fix `odin build examples\demo\` trailing slash handling. --- src/build_settings.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 8bc889635..b458d8308 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -1338,7 +1338,12 @@ bool init_build_paths(String init_filename) { } else { // Init filename was not 'current path'. // Contruct the output name from the path elements as usual. - String output_name = remove_directory_from_path(init_filename); + String output_name = init_filename; + // If it ends with a trailing (back)slash, strip it before continuing. + while (output_name.len > 0 && (output_name[output_name.len-1] == '/' || output_name[output_name.len-1] == '\\')) { + output_name.len -= 1; + } + output_name = remove_directory_from_path(output_name); output_name = remove_extension_from_path(output_name); output_name = copy_string(ha, string_trim_whitespace(output_name)); output_path = path_from_string(ha, output_name);