From edc522a05c2e99d93948f5596fb6383cf66ab50d Mon Sep 17 00:00:00 2001
From: David Bader <65665893+BunterSchatten@users.noreply.github.com>
Date: Thu, 30 Jul 2026 12:31:20 +0200
Subject: [PATCH] add assert to make sure old and new double_dash_pos are the
 same

---
 src/common.cpp |  7 +++++--
 src/main.cpp   | 13 +++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 133b1888a..76ace2755 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -640,7 +640,7 @@ gb_internal gb_inline f64 gb_sqrt(f64 x) {
 
 #if defined(GB_SYSTEM_WINDOWS)
 
-gb_internal wchar_t **command_line_to_wargv(wchar_t *cmd_line, int *_argc, wchar_t **_after_double_dash_raw) {
+gb_internal wchar_t **command_line_to_wargv(wchar_t *cmd_line, int *_argc, isize *_double_dash_pos, wchar_t **_after_double_dash_raw) {
 	u32 i, j;
 
 	u32 len = cast(u32)string16_len(cast(u16 *)cmd_line);
@@ -650,6 +650,7 @@ gb_internal wchar_t **command_line_to_wargv(wchar_t *cmd_line, int *_argc, wchar
 	wchar_t *_argv = cast(wchar_t *)((cast(u8 *)argv)+i);
 
 	wchar_t *after_double_dash_raw = nullptr;
+	isize double_dash_pos = -1;
 
 	u32 argc = 0;
 	argv[argc] = _argv;
@@ -660,12 +661,13 @@ gb_internal wchar_t **command_line_to_wargv(wchar_t *cmd_line, int *_argc, wchar
 	j = 0;
 
 	auto const check_double_dash = [&]() {
-		if (!after_double_dash_raw &&
+		if (double_dash_pos == -1 &&
 			argc >= 1 &&
 			argv[argc - 1][0] == '-' &&
 			argv[argc - 1][1] == '-' &&
 			argv[argc - 1][2] == '\0') {
 
+			double_dash_pos = argc - 1;
 			after_double_dash_raw = cmd_line + i;
 		}
 	};
@@ -718,6 +720,7 @@ gb_internal wchar_t **command_line_to_wargv(wchar_t *cmd_line, int *_argc, wchar
 	check_double_dash();
 
 	if (_argc) *_argc = argc;
+	if (_double_dash_pos) *_double_dash_pos = double_dash_pos;
 	if (_after_double_dash_raw) *_after_double_dash_raw = after_double_dash_raw;
 	return argv;
 }
diff --git a/src/main.cpp b/src/main.cpp
index ef304cd16..de4c219e2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -296,12 +296,12 @@ gb_internal bool system_exec_command_line_app_output(char const *command, gbStri
 	return true;
 }
 
-gb_internal Array<String> setup_args(int argc, char const **argv, wchar_t **after_double_dash_raw) {
+gb_internal Array<String> setup_args(int argc, char const **argv, isize *double_dash_pos, wchar_t **after_double_dash_raw) {
 	gbAllocator a = heap_allocator();
 
 #if defined(GB_SYSTEM_WINDOWS)
 	int wargc = 0;
-	wchar_t **wargv = command_line_to_wargv(GetCommandLineW(), &wargc, after_double_dash_raw);
+	wchar_t **wargv = command_line_to_wargv(GetCommandLineW(), &wargc, double_dash_pos, after_double_dash_raw);
 	auto args = array_make<String>(a, 0, wargc);
 	for (isize i = 0; i < wargc; i++) {
 		u16 *warg = cast(u16 *)wargv[i];
@@ -310,6 +310,8 @@ gb_internal Array<String> setup_args(int argc, char const **argv, wchar_t **afte
 		String arg = string16_to_string(a, wstr);
 		if (arg.len > 0) {
 			array_add(&args, arg);
+		} else if (double_dash_pos && *double_dash_pos > 0 && args.count < *double_dash_pos) {
+			*double_dash_pos -= 1;
 		}
 	}
 	return args;
@@ -3803,8 +3805,9 @@ int main(int arg_count, char const **arg_ptr) {
 	
 	init_build_context_error_pos_style();
 
+	isize double_dash_pos = -1;
 	wchar_t *after_double_dash_raw = nullptr;
-	Array<String> args = setup_args(arg_count, arg_ptr, &after_double_dash_raw);
+	Array<String> args = setup_args(arg_count, arg_ptr, &double_dash_pos, &after_double_dash_raw);
 #if !defined(GB_SYSTEM_WINDOWS)
 	Array<String> run_args = array_make<String>(heap_allocator(), 0, arg_count);
 	defer (array_free(&run_args));
@@ -3814,9 +3817,11 @@ int main(int arg_count, char const **arg_ptr) {
 	String init_filename = {};
 	isize  last_non_run_arg = args.count;
 
-	isize double_dash_pos = -1;
 	for_array(i, args) {
 		if (args[i] == "--") {
+#if defined(GB_SYSTEM_WINDOWS)
+			GB_ASSERT(double_dash_pos == i);
+#endif
 			double_dash_pos = i;
 			break;
 		}