FEAT: added possibility not to process default application arguments on boot

Author: Oldes

src/core/b-init.c

@@ -368,7 +368,6 @@ extern const REBYTE Str_Banner[];
 }
 
 
-
 /***********************************************************************
 **
 */	static void Init_Ops(void)
@@ -821,6 +820,27 @@ static void Set_Option_File(REBCNT field, REBYTE* src, REBOOL dir )
 	REBCHR *data;
 	REBCNT n;
 
+#ifdef RAW_MAIN_ARGS
+	REBSER *str;
+	REBVAL *new;
+	// make system/options/flags block even when not used...
+	val = Get_System(SYS_OPTIONS, OPTIONS_FLAGS);
+	Set_Block(val, Make_Block(3));
+	// clear list of default flags (system/catalog/boot-flags)
+	val = Get_System(SYS_CATALOG, CAT_BOOT_FLAGS);
+	SET_NONE(val);
+	// convert raw argument strings to block of strings...
+	ser = Make_Block(3);
+	for (n = 1; n < rargs->argc ; n++) {
+		REBCHR *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);
+#else
 
 	ser = Make_Block(3);
 	n = 2; // skip first flag (ROF_EXT)
@@ -830,8 +850,11 @@ static void Set_Option_File(REBCNT field, REBYTE* src, REBOOL dir )
 		if (rargs->options & n) Append_Val(ser, val); 
 		n <<= 1;
 	}
+	// last value is always TRUE, so it's possible to use just *path* instead of `find`
+	// like: `if system/options/flags/verbose [...]`
 	val = Append_Value(ser);
 	SET_TRUE(val);
+	
 	val = Get_System(SYS_OPTIONS, OPTIONS_FLAGS);
 	Set_Block(val, ser);
 
@@ -846,16 +869,6 @@ static void Set_Option_File(REBCNT field, REBYTE* src, REBOOL dir )
 		Set_Option_File(OPTIONS_SCRIPT, (REBYTE*)rargs->script, FALSE);
 	}
 
-	if (rargs->exe_path) {
-		Set_Option_File(OPTIONS_BOOT, (REBYTE*)rargs->exe_path, FALSE);
-	}
-
-	// Print("home: %s", rargs->home_dir);
-	if (rargs->home_dir) {
-		Set_Option_File(OPTIONS_HOME, (REBYTE*)rargs->home_dir, TRUE);
-		OS_FREE(rargs->home_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
@@ -867,7 +880,16 @@ static void Set_Option_File(REBCNT field, REBYTE* src, REBOOL dir )
 	Set_Option_String(rargs->import, OPTIONS_IMPORT);
 
 	Set_Option_Word(rargs->secure, OPTIONS_SECURE);
+#endif
+	if (rargs->exe_path) {
+		Set_Option_File(OPTIONS_BOOT, (REBYTE*)rargs->exe_path, FALSE);
+	}
 
+	// Print("home: %s", rargs->home_dir);
+	if (rargs->home_dir) {
+		Set_Option_File(OPTIONS_HOME, (REBYTE*)rargs->home_dir, TRUE);
+		OS_FREE(rargs->home_dir);
+	}
 	if (NZ(data = OS_GET_LOCALE(0))) {
 		val = Get_System(SYS_LOCALE, LOCALE_LANGUAGE);
 		Set_String(val, Copy_OS_Str(data, (REBINT)LEN_STR(data)));

src/include/reb-args.h

@@ -40,6 +40,10 @@ typedef struct rebol_args {
 	REBCHR *boot;
 	REBCHR *exe_path;
 	REBCHR *home_dir;
+#ifdef RAW_MAIN_ARGS
+	REBCNT argc;
+	REBCHR **argv;
+#endif
 } REBARGS;
 
 // REBOL arg option flags:

src/mezz/sys-start.reb

@@ -73,7 +73,7 @@ start: func [
 	;-- Convert command line arg strings as needed:
 	script-args: args ; save for below
 	foreach [opt act] [
-		args    [parse args ""]
+		;args    [parse args ""]
 		do-arg  block!
 		debug   block!
 		secure  word!

src/os/host-args.c

@@ -197,14 +197,29 @@ const struct arg_chr arg_chars2[] = {
 **		Parse REBOL's command line arguments, setting options
 **		and values in the provided args structure.
 **
+**		If RAW_MAIN_ARGS is used, the arguments list is not being
+**		parsed in this function, but instead will be converted to
+**		block of strings and leaved on interpreter to process it.
+**
 ***********************************************************************/
 {
+#ifdef RAW_MAIN_ARGS
+	CLEARS(rargs);
+	rargs->argc = argc;
+	rargs->argv = argv;
+	// First arg is path to executable (on most systems):
+	if (argc > 0) rargs->exe_path = *argv;
+	OS_Get_Current_Dir(&rargs->home_dir);
+#else
 	int arg_buf_size=128;
 
 	REBCHR *arg;
 	REBCHR *args = 0; // holds trailing args
 	int flag;
 	int i;
+	int len;
+	int size;
+	REBCHR *tmp;
 
 	CLEARS(rargs);
 
@@ -261,9 +276,6 @@ const struct arg_chr arg_chars2[] = {
 			if (!rargs->script)
 				rargs->script = arg;
 			else {
-				int len;
-				int size;
-				REBCHR *tmp;
 				if (!args) {
 					args = MAKE_STR(arg_buf_size);
 					args[0] = 0;
@@ -289,6 +301,7 @@ const struct arg_chr arg_chars2[] = {
 		args[LEN_STR(args)-1] = 0; // remove trailing space
 		Get_Ext_Arg(RO_ARGS, rargs, args);
 	}
+#endif
 }