__args__: []cstring

core/_preload.odin

@@ -132,8 +132,7 @@ Type_Info :: struct {
 // This will be set by the compiler
 __type_table: []Type_Info;
 
-__argc__: i32;
-__argv__: ^^byte;
+__args__: []cstring;
 
 // IMPORTANT NOTE(bill): Must be in this order (as the compiler relies upon it)
 

core/os_linux.odin

@@ -269,9 +269,9 @@ dlerror :: proc() -> string {
 
 
 _alloc_command_line_arguments :: proc() -> []string {
-	args := make([]string, __argc__);
-	for i in 0..__argc__ {
-		args[i] = string(cstring((__argv__+i)^));
+	args := make([]string, len(__args__));
+	for arg, i in __args__ {
+		args[i] = string(arg);
 	}
 	return args;
 }

core/os_x.odin

@@ -284,9 +284,9 @@ dlerror :: proc() -> string {
 
 
 _alloc_command_line_arguments :: proc() -> []string {
-	args := make([]string, __argc__);
-	for i in 0..__argc__ {
-		args[i] = string((__argv__+i)^);
+	args := make([]string, len(__args__));
+	for arg, i in __args__ {
+		args[i] = string(arg);
 	}
 	return args;
 }