FIX: Interpreter too eagerly consuming command-line arguments & arguments containing whitespace

resolves: Oldes/Rebol-issues#2227
resolves: Oldes/Rebol-issues#1890

Author: Oldes

src/core/b-init.c

@@ -819,12 +819,13 @@ static void Set_Option_File(REBCNT field, REBYTE* src, REBOOL dir )
 ***********************************************************************/
 {
 	REBVAL *val;
+	REBCHR *arg;
+	REBVAL *new;
 	REBSER *ser;
 	REBCHR *data;
 	REBCNT n;
 
 #ifdef RAW_MAIN_ARGS
-	REBVAL *new;
 	// make system/options/flags block even when not used...
 	val = Get_System(SYS_OPTIONS, OPTIONS_FLAGS);
 	Set_Block(val, Make_Block(3));
@@ -834,7 +835,7 @@ static void Set_Option_File(REBCNT field, REBYTE* src, REBOOL dir )
 	// convert raw argument strings to block of strings...
 	ser = Make_Block(3);
 	for (n = 1; n < rargs->argc ; n++) {
-		REBCHR *arg = rargs->argv[n];
+		arg = rargs->argv[n];
 		if (arg == 0) continue; // shell bug
 		new = Append_Value(ser);
 		Set_String(new, Copy_OS_Str(arg, (REBINT)LEN_STR(arg)));
@@ -843,7 +844,7 @@ static void Set_Option_File(REBCNT field, REBYTE* src, REBOOL dir )
 	val = Get_System(SYS_OPTIONS, OPTIONS_ARGS);
 	Set_Block(val, ser);
 #else
-
+	// collect flags...
 	ser = Make_Block(3);
 	n = 2; // skip first flag (ROF_EXT)
 	val = Get_System(SYS_CATALOG, CAT_BOOT_FLAGS);
@@ -874,9 +875,26 @@ static void Set_Option_File(REBCNT field, REBYTE* src, REBOOL dir )
 	n = Set_Option_Word(rargs->boot, OPTIONS_BOOT_LEVEL);
 	if (n >= SYM_BASE && n <= SYM_MODS)
 		PG_Boot_Level = n - SYM_BASE; // 0 - 3
+	
+	// store args in a block
+	ser = Make_Block(3);
+	if (rargs->args) {
+		// if used --args, store this value as a first one
+		new = Append_Value(ser);
+		Set_String(new, Copy_OS_Str(rargs->args, (REBINT)LEN_STR(rargs->args)));
+	}
+	// the rest of args, if there are any...
+	for (n = 0; n < rargs->argc; n++) {
+		arg = rargs->argv[n];
+		if (arg == 0) continue; // shell bug
+		new = Append_Value(ser);
+		Set_String(new, Copy_OS_Str(arg, (REBINT)LEN_STR(arg)));
+		//if(arg[0]=='-')	VAL_SET_LINE(new);
+	}
+	val = Get_System(SYS_OPTIONS, OPTIONS_ARGS);
+	Set_Block(val, ser);
 
-	Set_Option_String(rargs->args, OPTIONS_ARGS);
-	Set_Option_String(rargs->do_arg, OPTIONS_DO_ARG);
+	// other option values...
 	Set_Option_String(rargs->debug, OPTIONS_DEBUG);
 	Set_Option_String(rargs->version, OPTIONS_VERSION);
 	Set_Option_String(rargs->import, OPTIONS_IMPORT);

src/include/reb-args.h

@@ -31,7 +31,6 @@
 typedef struct rebol_args {
 	REBCNT options;
 	REBCHR *script;
-	REBCHR *args;
 	REBCHR *do_arg;
 	REBCHR *version;
 	REBCHR *debug;
@@ -40,10 +39,9 @@ typedef struct rebol_args {
 	REBCHR *boot;
 	REBCHR *exe_path;
 	REBCHR *current_dir;
-#ifdef RAW_MAIN_ARGS
-	REBCNT argc;
-	REBCHR **argv;
-#endif
+	REBCHR *args;         // value for the --args option
+	REBCNT  argc;         // unprocessed argument count
+	REBCHR **argv;        // unprocessed arguments
 } REBARGS;
 
 // REBOL arg option flags:

src/mezz/sys-start.reb

@@ -204,7 +204,9 @@ start: func [
 				header: first code
 				parent: none
 				path: what-dir
-				args: script-args
+				; if there was used --args option, pass to script only this value
+				; and ignore other optional arguments
+				args: either system/options/flags/args [to block! first script-args][script-args]
 			]
 			either 'module = select first code 'type [
 				code: reduce [first+ code code]

src/os/host-args.c

@@ -215,15 +215,9 @@ const struct arg_chr arg_chars2[] = {
 	OS_Get_Current_Dir(&rargs->current_dir);
 
 #else
-	int arg_buf_size=128;
 
 	REBCHR *arg;
-	REBCHR *args = NULL; // holds trailing args
-	int flag;
-	int i;
-	int len;
-	int size;
-	REBCHR *tmp;
+	int flag, i;
 
 	CLEARS(rargs);
 
@@ -241,6 +235,10 @@ const struct arg_chr arg_chars2[] = {
 		if (arg == 0) continue; // shell bug
 		if (*arg == '-') {
 			if (arg[1] == '-') {
+				if (arg[2] == 0) {
+					// --  stops options parsing for the interpreter
+					break;
+				}
 				// --option words
 				flag = find_option_word(arg+2);
 				if (flag & RO_EXT) {
@@ -280,35 +278,16 @@ const struct arg_chr arg_chars2[] = {
 		}
 		else {
 			// script filename
-			if (!rargs->script)
-				rargs->script = arg;
-			else {
-				if (!args) {
-					args = MAKE_STR(arg_buf_size);
-					if (!args) return;
-					args[0] = 0;
-				}
-				len = (int)LEN_STR(arg) + (int)LEN_STR(args) + 2;
-				size = arg_buf_size;
-				while (size < len) size *= 2;
-				if (size > arg_buf_size) {
-					tmp = args;
-					args = MAKE_STR(size);
-					if (!args) return;
-					memcpy(args, tmp, arg_buf_size);
-					arg_buf_size = size;
-					FREE_MEM(tmp);
-				}
-				len = arg_buf_size - (int)LEN_STR(args) - 2; // space remaining
-				JOIN_STR(args, arg, len);
-				JOIN_STR(args, TXT(" "), 1);
-			}
+			rargs->script = arg;
+			// after having processed a command-line argument as scriptname,
+			// all remaining arguments are passed as-is to the script (via system/options/args)
+			break;
 		}
 	}
-
-	if (args) {
-		args[LEN_STR(args)-1] = 0; // remove trailing space
-		Get_Ext_Arg(RO_ARGS, rargs, args);
+	// if there are still unprocessed args, pass them as a block (converted later in b-init.c)
+	if (argc > i++) {
+		rargs->argc = argc - i;
+		rargs->argv = argv + i;
 	}
 #endif
 }