fixed -D regression

Author: tilkinsc

src/consolew.h

@@ -444,10 +444,8 @@ static inline int start_protective_mode_require(const char* file) {
 
 // parses globals dynamic array and sets up global variables properly
 static inline void load_globals(Array* globals, void* data) {
-	char* str = (char*) data + 2; // gather argument, ignore -D/-d
-	
 	// split argument between '=', max is two (left and right)
-	char* m_args = strsplit(str, '=', strlen(str) + 1, 2);
+	char* m_args = strsplit((char*) data, '=', strlen((char*) data) + 1, 2);
 	check_error(m_args == NULL, _("GLOBALS_ERROR_BAD_D"));
 
 	char* arg1 = m_args; // left arg of '='

src/jitsupport.c

@@ -176,14 +176,12 @@
 			for(size_t i=0; i<luajit_jcmds->size; i++)
 				if(dojitcmd(L, (const char*) array_get(luajit_jcmds, i)) != 0)
 					fputs(_("JS_FAILED_CONTROL_CMD"), stderr);
-			array_free(luajit_jcmds);
 		}
 
 		if(luajit_opts != NULL) {
 			for(size_t i=0; i<luajit_opts->size; i++)
 				if(dojitopt(L, (const char*) array_get(luajit_opts, i)) != 0)
 					fputs(_("JS_FAILED_SET_O"), stderr);
-			array_free(luajit_opts);
 		}
 
 		if(squelch == 0 && post_exist == 1)

src/ldata.c

@@ -265,10 +265,8 @@ LC_LD_API int luacon_loaddll(LC_ARGS _ARGS, LangCache* _lang)
 
 
 	// initiate global variables set up
-	if(ARGS.globals != NULL) {
+	if(ARGS.globals != NULL)
 		array_consume(ARGS.globals, load_globals);
-		array_free(ARGS.globals);
-	}
 
 
 	// load parameters early
@@ -308,10 +306,8 @@ LC_LD_API int luacon_loaddll(LC_ARGS _ARGS, LangCache* _lang)
 
 
 	// do passed libraries/modules
-	if(ARGS.libraries != NULL) {
+	if(ARGS.libraries != NULL)
 		array_consume(ARGS.libraries, load_libraries);
-		array_free(ARGS.libraries);
-	}
 
 
 	// run executable string after -l's

src/luadriver.c

@@ -223,6 +223,7 @@ int main(int argc, char** argv) {
 			ARGS.run_str = (argv[i][2] == 0 ? argv[i+1] : argv[i]+2);
 			break;
 		case 'c': case 'C':
+			ARGS.post_exist = 0;
 			ARGS.do_luac = 1;
 			ARGS.luac_argc = argc - i;
 			ARGS.luac_argv = &(argv[i]);

travis.sh

@@ -72,10 +72,10 @@ pushd bin/Debug
 	./luaw -w lua-5.1.5 -e "print('Everything went okay')"
 
 	echo "Test 6"
-	./luaw "res/testing.lua" -Dtest=5 -n a b c
+	./luaw res/testing.lua -Dtest=5 -n a b c
 
 	echo "Test 7"
-	./luaw -c -o testing.luac "res/testing.lua"
+	./luaw -b res/testing.lua testing.luac
 	./luaw testing.luac -Dtest=5 -n a b c
 
 	echo "Test 8"