Merge pull request #252 from fkaa/rewrite-init

Rewrite initialisation to not restart process

Author: rakiru

.gitignore

@@ -62,4 +62,7 @@ ZERO_CHECK.vcproj
 *.ipr
 *.iws
 
+# vim stuff
+.vimrc
+
 # clsave/vol/fastload.tmp

include/common.h

@@ -32,12 +32,15 @@
 #define NET_HOST_SIZE 256
 #define NET_PATH_SIZE 256
 
-#define IB_CLIENT 0x1
-#define IB_SERVER 0x2
-#define IB_LAUNCHER 0x4
-#define IB_MAIN_LOADED 0x10
-#define IB_MAIN_LOADING 0x20
-#define IB_ENET 0x80
+#define IB_CLIENT       (0x1 << 0)
+#define IB_SERVER       (0x1 << 1)
+#define IB_LAUNCHER     (0x1 << 2)
+#define IB_MAIN_LOADED  (0x1 << 3)
+#define IB_MAIN_LOADING (0x1 << 4)
+#define IB_ENET         (0x1 << 5)
+
+#define IB_QUIT_SHUTDOWN (0x1 << 0)
+#define IB_QUIT_RESTART  (0x1 << 1)
 
 #define MODEL_BONE_MAX  256
 #define MODEL_POINT_MAX 4096
@@ -604,20 +607,25 @@ extern char *net_address;
 extern char *net_path;
 
 extern char *mod_basedir;
+extern int restart_boot_mode;
 extern int boot_mode;
+extern int quitflag;
 
-extern int main_argc;
-extern char **main_argv;
-extern char *main_argv0;
-extern char *main_oldcwd;
-extern int main_largstart;
+extern char **lua_args;
+extern int lua_args_len;
 
 int run_game_cont1(void);
 int run_game_cont2(void);
 
 int error_sdl(char *msg);
 int error_perror(char *msg);
 
+#ifndef DEDI
+void ib_create_launcher(const char *pkg);
+void ib_create_server(int port, const char *pkg);
+void ib_join_server(const char *address, int port);
+#endif
+
 // map.c
 map_t *map_parse_aos(int len, const char *data);
 map_t *map_parse_icemap(int len, const char *data);

pkg/iceball/config/main_client.lua

@@ -318,9 +318,11 @@ function client.hook_key(key, state, modif, uni)
 			if field[4] == "action_save" then
 				common.json_write("clsave/pub/user.json", profile)
 				common.json_write("clsave/config.json", config)
-				client.mk_sys_execv()
+				client.create_launcher("pkg/iceball/launch")
+				-- client.mk_sys_execv()
 			elseif field[4] == "action_exit" then
-				client.mk_sys_execv()
+				client.create_launcher("pkg/iceball/launch")
+				-- client.mk_sys_execv()
 			end
 		elseif key == SDLK_UP then
 			selected = selected - 1

pkg/iceball/launch/main_client.lua

@@ -84,17 +84,20 @@ local function join_server(sid)
 	local idx = (page * 9) + sid
 	if idx <= #server_list then
 		local sv = server_list[idx]
-		client.mk_sys_execv("-c", sv.address, sv.port, arg_closure(argv))
+		client.join_server(sv.address, sv.port, arg_closure(argv))
+		-- client.mk_sys_execv("-c", sv.address, sv.port, arg_closure(argv))
 	end
 end
 
 -- Some hooks
 function client.hook_key(key, state, modif, uni)
 	if not state then
 		if key == SDLK_l then
-			client.mk_sys_execv("-s", "20737", "pkg/base", arg_closure(argv))
+			client.create_server(20737, "pkg/base", arg_closure(argv))
+			-- client.mk_sys_execv("-s", "20737", "pkg/base", arg_closure(argv))
 		elseif key == SDLK_c then
-			client.mk_sys_execv("-l", "pkg/iceball/config")
+			client.create_launcher("pkg/iceball/config")
+			-- client.mk_sys_execv("-l", "pkg/iceball/config")
 		elseif key == SDLK_ESCAPE then
 			client.hook_tick = nil
 		elseif key >= SDLK_1 and key <= SDLK_9 then

src/lua.c

@@ -81,87 +81,69 @@ int icelua_fn_common_mk_compat_disable(lua_State *L)
 	return 0;
 }
 #ifndef DEDI
-int icelua_fn_client_mk_sys_execv(lua_State *L)
+static void update_lua_args(lua_State *L)
 {
-	if(!(boot_mode & IB_LAUNCHER))
-		return luaL_error(L, "mk_sys_execv called when not in -l mode");
-
 	int top = lua_gettop(L);
-	char **arglist = malloc(sizeof(char *) * (top+2));
-	int i;
 
-	for(i = 1; i <= top; i++)
-		arglist[i] = strdup(lua_tostring(L, i));
-
-	arglist[0] = strdup(main_argv0);
-	arglist[top+1] = NULL;
-
-	SDL_Quit();
-#ifdef WIN32
-#if 1
-	//if(main_oldcwd != NULL)
-	//	_chdir(main_oldcwd);
-	
-	char cwd[2048] = "";
-	GetModuleFileName(NULL, cwd, 2047);
-	char *v = cwd + strlen(cwd) - 1;
-	while (v >= cwd)
-	{
-		if (*v == '\\')
-		{
-			v++;
-			break;
+	if (lua_args) {
+		for (int i = 0; i < lua_args_len; ++i) {
+			free(lua_args[i]);
 		}
-		v--;
+
+		free(lua_args);
+		lua_args = NULL;
 	}
-	arglist[0] = v;
-	
-	for (i = 0; i <= top; i++)
-	{
-		int new_size = strlen(arglist[i]) + 3;
-		int j;
-		for (j = 0; j < strlen(arglist[i]); j++)
-		{
-			if (arglist[i][j] == '"' || arglist[i][j] == '\\')
-				new_size++;
-		}
-		char *new_arg = malloc(new_size);
-		char *k = new_arg;
-		char *l = arglist[i];
-		*(k++) = '"';
-		while (*l != 0)
-		{
-			if (*l == '"' || *l == '\\')
-				*(k++) = '\\';
-			*(k++) = *(l++);
+
+	if (top > 2) {
+		lua_args = malloc(sizeof(*lua_args) * (top - 3));
+
+		for(int i = 3; i <= top; i++) {
+			lua_args[i - 3] = strdup(lua_tostring(L, i));
 		}
-		*(k++) = '"';
-		*(k++) = 0;
-		arglist[i] = new_arg;
 	}
-	/*FILE *fp = fopen("FUCK.txt", "w");
-	for (i = 0; i <= top; i++)
-	{
-		fprintf(fp, "%s ", arglist[i]);
-		fflush(fp);
-	}*/
-#else
-	char *v = strdup("iceball.exe");
-	arglist[0] = v;
-#endif
-#endif
-	printf("argv0: [%s]\n", main_argv0);
-	fflush(stdout);
+}
+
+int icelua_fn_client_join_server(lua_State *L)
+{
+	if (!(boot_mode & IB_LAUNCHER))
+		return luaL_error(L, "join_server called when not in -l mode");
+
+	update_lua_args(L);
 
-	execv(main_argv0, arglist);
+	const char *address = lua_tostring(L, 1);
+	int port = lua_tonumber(L, 2);
 
-	printf("WORK YOU FUCKASS: %s\n", strerror(errno));
-	fflush(stdout);
+	ib_join_server(address, port);
+
+	return 0;
+}
+
+int icelua_fn_client_create_server(lua_State *L)
+{
+	if (!(boot_mode & IB_LAUNCHER))
+		return luaL_error(L, "create_server called when not in -l mode");
+
+	update_lua_args(L);
+
+	int port = lua_tonumber(L, 1);
+	const char *pkg = lua_tostring(L, 2);
+
+	ib_create_server(port, pkg);
+
+	return 0;
+}
+
+int icelua_fn_client_create_launcher(lua_State *L)
+{
+	if (!(boot_mode & IB_LAUNCHER))
+		return luaL_error(L, "create_launcher called when not in -l mode");
+
+	int top = lua_gettop(L);
+
+	const char *pkg = lua_tostring(L, -1);
+
+	ib_create_launcher(pkg);
 
-	// DOES NOT RETURN.
-	fprintf(stderr, "ABORT: sys_execv must not return!\n");
-	fflush(stderr);
-	abort();
 	return 0;
 }
 
@@ -208,8 +190,10 @@ int icelua_fn_client_mk_set_title(lua_State *L)
 
 #ifndef DEDI
 struct icelua_entry icelua_client[] = {
+	{icelua_fn_client_create_launcher, "create_launcher"},
+	{icelua_fn_client_create_server, "create_server"},
+	{icelua_fn_client_join_server, "join_server"},
 	{icelua_fn_client_mk_set_title, "mk_set_title"},
-	{icelua_fn_client_mk_sys_execv, "mk_sys_execv"},
 
 	{icelua_fn_client_text_input_start, "text_input_start"},
 	{icelua_fn_client_text_input_stop, "text_input_stop"},
@@ -402,11 +386,7 @@ void icelua_loadbasefuncs(lua_State *L)
 
 int icelua_initfetch(void)
 {
-	int i;
 	char xpath[128+1];
-	int argct = (main_largstart == -1 || (main_largstart >= main_argc)
-		? 0
-		: main_argc - main_largstart);
 
 	if(to_client_local.sockfd == -1)
 		to_client_local.sockfd = SOCKFD_LOCAL;
@@ -439,8 +419,10 @@ int icelua_initfetch(void)
 	}
 
 	printf("Client loaded! Initialising...\n");
-	for(i = 0; i < argct; i++)
-		lua_pushstring(lstate_client, main_argv[i+main_largstart]);
+	for(int i = 0; i < lua_args_len; i++)
+		lua_pushstring(lstate_client, lua_args[i]);
+
+	int argct = lua_args_len;
 	if((boot_mode & IB_CLIENT) && net_path[1] != '\x00')
 	{
 		lua_pushstring(lstate_client, net_path);
@@ -506,8 +488,6 @@ void icelua_pushversion(lua_State *L, const char *tabname)
 
 int icelua_init(void)
 {
-	int i, argct;
-
 	// create states
 	if(boot_mode & IB_CLIENT)
 	{
@@ -681,7 +661,7 @@ int icelua_init(void)
 				raw_whitelist = malloc(sizeof(struct icelua_whitelist)*raw_whitelist_len);
 
 				// read each entry
-				for(i = 0; i < raw_whitelist_len; i++)
+				for(int i = 0; i < raw_whitelist_len; i++)
 				{
 					printf("entry %i/%i\n", i+1, raw_whitelist_len);
 					// get entry
@@ -818,15 +798,12 @@ int icelua_init(void)
 		return 1;
 	}
 
-	argct = (main_largstart == -1 || (main_largstart >= main_argc)
-		? 0
-		: main_argc - main_largstart);
-
 	if(lstate_server != NULL)
 	{
-		for(i = 0; i < argct; i++)
-			lua_pushstring(lstate_server, main_argv[i+main_largstart]);
-		if(lua_pcall(lstate_server, argct, 0, 0) != 0)
+		for(int i = 0; i < lua_args_len; i++)
+			lua_pushstring(lstate_server, lua_args[i]);
+
+		if(lua_pcall(lstate_server, lua_args_len, 0, 0) != 0)
 		{
 			printf("ERROR running server Lua: %s\n", lua_tostring(lstate_server, -1));
 			lua_pop(lstate_server, 1);
@@ -870,6 +847,11 @@ int icelua_init(void)
 
 void icelua_deinit(void)
 {
+	if (lstate_client)
+		lua_close(lstate_client);
+
+	if (lstate_server)
+		lua_close(lstate_server);
 	// TODO!
 }