FIX: fine tune exit sequence to be nice with -v argument (early exit)

Author: Oldes

src/core/b-init.c

@@ -958,8 +958,8 @@ static void Set_Option_File(REBCNT field, REBYTE* src, REBOOL dir )
 
 	Init_Raw_Print();		// Low level output (Print)
 
-	Print_Banner(rargs);
-
+	Print_Banner(rargs);    // Can cause early exit (-v)
+	PG_Boot_Phase = BOOT_STARTED;
 	DOUT("Level 1");
 	Init_Char_Cases();
 	Init_CRC();				// For word hashing
@@ -1040,32 +1040,37 @@ static void Set_Option_File(REBCNT field, REBYTE* src, REBOOL dir )
 		return; // can happen when close button, shutdown, etc.
 
 	Free_Series(Task_Series);
-	Free_Series(Bind_Table);
-	Free_Series(PG_Word_Table.hashes);
-	Free_Series(PG_Word_Table.series);
-	Free_Series(PG_Word_Names);
+	if (PG_Boot_Phase > BOOT_START) {
+		Free_Series(Bind_Table);
+		Free_Series(PG_Word_Table.hashes);
+		Free_Series(PG_Word_Table.series);
+		Free_Series(PG_Word_Names);
+	}
 	Free_Series(VAL_SERIES(ROOT_ROOT));
-	Free_Series(VAL_SERIES(ROOT_SYSTEM));
-	Free_Series(VAL_SERIES(ROOT_ERROBJ));
-	Free_Series(VAL_SERIES(ROOT_STRINGS));
-	Free_Series(VAL_SERIES(ROOT_TYPESETS));
-	Free_Series(VAL_SERIES(ROOT_BOOT));
-	Free_Series(VAL_SERIES(TASK_STACK));
-	Free_Series(VAL_SERIES(TASK_BUF_EMIT));
-	Free_Series(VAL_SERIES(TASK_BUF_WORDS));
-	Free_Series(VAL_SERIES(TASK_BUF_UTF8));
-	Free_Series(VAL_SERIES(TASK_BUF_PRINT));
-	Free_Series(VAL_SERIES(TASK_BUF_FORM));
-	Free_Series(VAL_SERIES(TASK_BUF_MOLD));
-	Free_Series(VAL_SERIES(TASK_MOLD_LOOP));
-
+	if (PG_Boot_Phase >= BOOT_MEZZ) {
+		Free_Series(VAL_SERIES(ROOT_SYSTEM));
+		Free_Series(VAL_SERIES(ROOT_ERROBJ));
+		Free_Series(VAL_SERIES(ROOT_STRINGS));
+		Free_Series(VAL_SERIES(ROOT_TYPESETS));
+		Free_Series(VAL_SERIES(ROOT_BOOT));
+		Free_Series(VAL_SERIES(TASK_STACK));
+		Free_Series(VAL_SERIES(TASK_BUF_EMIT));
+		Free_Series(VAL_SERIES(TASK_BUF_WORDS));
+		Free_Series(VAL_SERIES(TASK_BUF_UTF8));
+		Free_Series(VAL_SERIES(TASK_BUF_PRINT));
+		Free_Series(VAL_SERIES(TASK_BUF_FORM));
+		Free_Series(VAL_SERIES(TASK_BUF_MOLD));
+		Free_Series(VAL_SERIES(TASK_MOLD_LOOP));
+	}
 	Dispose_Memory();
-	Dispose_Char_Cases();
-	Dispose_Ports();
-	Dispose_Mold();
-	Dispose_CRC();
+	if (PG_Boot_Phase > BOOT_STARTED) {
+		Dispose_Char_Cases();
+		Dispose_Ports();
+		Dispose_Mold();
+		Dispose_CRC();
+		Free_Mem(PG_Boot_Strs, 0);
+	}
 	Dispose_StdIO();
 	Free_Mem(PG_Reb_Stats, 0);
-	Free_Mem(PG_Boot_Strs, 0);
 	Free_Mem(Reb_Opts, 0);
 }

src/include/sys-core.h

@@ -130,6 +130,7 @@ typedef struct rebol_mold {
 
 enum Boot_Phases {
 	BOOT_START = 0,
+	BOOT_STARTED,
 	BOOT_LOADED,
 	BOOT_ERRORS,
 	BOOT_MEZZ,