X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cmd.c;h=2e1323a41f9ed62c741931ad0ca5ceb5ca8f6813;hb=d560c170ab305550f8fc6ab39d94daee5b732fbd;hp=ec5e3cb5197a72e0d1a12fe02e22acedcab808b6;hpb=faafbec894094c27f0f50abb1c0b828180523854;p=xonotic%2Fdarkplaces.git

diff --git a/cmd.c b/cmd.c
index ec5e3cb5..2e1323a4 100644
--- a/cmd.c
+++ b/cmd.c
@@ -115,25 +115,25 @@ void Cbuf_InsertText (const char *text)
 	char	*temp;
 	int		templen;
 
-// copy off any commands still remaining in the exec buffer
+	// copy off any commands still remaining in the exec buffer
 	templen = cmd_text.cursize;
 	if (templen)
 	{
-		temp = Z_Malloc (templen);
+		temp = Mem_Alloc (tempmempool, templen);
 		memcpy (temp, cmd_text.data, templen);
 		SZ_Clear (&cmd_text);
 	}
 	else
-		temp = NULL;	// shut up compiler
+		temp = NULL;
 
-// add the entire text of the file
+	// add the entire text of the file
 	Cbuf_AddText (text);
 
-// add the copied off data
-	if (templen)
+	// add the copied off data
+	if (temp != NULL)
 	{
 		SZ_Write (&cmd_text, temp, templen);
-		Z_Free (temp);
+		Mem_Free (temp);
 	}
 }
 
@@ -216,9 +216,9 @@ quake -nosound +cmd amlev1
 */
 void Cmd_StuffCmds_f (void)
 {
-	int		i, j;
-	int		s;
-	char	*text, *build, c;
+	int		i, j, l;
+	// this is per command, and bounds checked (no buffer overflows)
+	char	build[2048];
 
 	if (Cmd_Argc () != 1)
 	{
@@ -226,56 +226,35 @@ void Cmd_StuffCmds_f (void)
 		return;
 	}
 
-// build the combined string to parse from
-	s = 0;
-	for (i=1 ; i<com_argc ; i++)
-	{
-		if (!com_argv[i])
-			continue;		// NEXTSTEP nulls out -NXHost
-		s += strlen (com_argv[i]) + 1;
-	}
-	if (!s)
-		return;
-
-	text = Z_Malloc (s+1);
-	text[0] = 0;
-	for (i=1 ; i<com_argc ; i++)
-	{
-		if (!com_argv[i])
-			continue;		// NEXTSTEP nulls out -NXHost
-		strcat (text,com_argv[i]);
-		if (i != com_argc-1)
-			strcat (text, " ");
-	}
-
-// pull out the commands
-	build = Z_Malloc (s+1);
-	build[0] = 0;
-
-	for (i=0 ; i<s-1 ; i++)
+	for (i = 0;i < com_argc;i++)
 	{
-		if (text[i] == '+')
+		if (com_argv[i] && com_argv[i][0] == '+' && (com_argv[i][1] < '0' || com_argv[i][1] > '9'))
 		{
+			l = 0;
+			j = 1;
+			while (com_argv[i][j])
+				build[l++] = com_argv[i][j++];
 			i++;
-
-			for (j=i ; (text[j] != '+') && (text[j] != '-') && (text[j] != 0) ; j++)
-				;
-
-			c = text[j];
-			text[j] = 0;
-
-			strcat (build, text+i);
-			strcat (build, "\n");
-			text[j] = c;
-			i = j-1;
+			for (;i < com_argc;i++)
+			{
+				if (!com_argv[i])
+					continue;
+				if ((com_argv[i][0] == '+' || com_argv[i][0] == '-') && (com_argv[i][1] < '0' || com_argv[i][1] > '9'))
+					break;
+				if (l + strlen(com_argv[i]) + 5 > sizeof(build))
+					break;
+				build[l++] = ' ';
+				build[l++] = '\"';
+				for (j = 0;com_argv[i][j];j++)
+					build[l++] = com_argv[i][j];
+				build[l++] = '\"';
+			}
+			build[l++] = '\n';
+			build[l++] = 0;
+			Cbuf_InsertText (build);
+			i--;
 		}
 	}
-
-	if (build[0])
-		Cbuf_InsertText (build);
-
-	Z_Free (text);
-	Z_Free (build);
 }
 
 
@@ -294,7 +273,7 @@ static void Cmd_Exec_f (void)
 		return;
 	}
 
-	f = (char *)FS_LoadFile (Cmd_Argv(1), false);
+	f = (char *)FS_LoadFile (Cmd_Argv(1), tempmempool, false);
 	if (!f)
 	{
 		Con_Printf("couldn't exec %s\n",Cmd_Argv(1));
@@ -330,15 +309,6 @@ Cmd_Alias_f
 Creates a new command that executes a command string (possibly ; seperated)
 ===============
 */
-static char *CopyString (char *in)
-{
-	char *out;
-
-	out = Z_Malloc (strlen(in)+1);
-	strcpy (out, in);
-	return out;
-}
-
 static void Cmd_Alias_f (void)
 {
 	cmdalias_t	*a;
@@ -390,7 +360,8 @@ static void Cmd_Alias_f (void)
 	}
 	strlcat (cmd, "\n", sizeof (cmd));
 
-	a->value = CopyString (cmd);
+	a->value = Z_Malloc (strlen (cmd) + 1);
+	strcpy (a->value, cmd);
 }
 
 /*
@@ -470,7 +441,7 @@ Cmd_Init
 */
 void Cmd_Init (void)
 {
-	cmd_mempool = Mem_AllocPool("commands");
+	cmd_mempool = Mem_AllocPool("commands", 0, NULL);
 
 //
 // register our commands
@@ -484,6 +455,8 @@ void Cmd_Init (void)
 	Cmd_AddCommand ("cmdlist", Cmd_List_f); 	// Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com
 	Cmd_AddCommand ("cvarlist", Cvar_List_f);	// 2000-01-09 CmdList, CvarList commands
 												// By Matthias "Maddes" Buecher
+	Cmd_AddCommand ("set", Cvar_Set_f);
+	Cmd_AddCommand ("seta", Cvar_SetA_f);
 }
 
 /*
@@ -810,7 +783,7 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src)
 	}
 
 // check functions (only after host_initialized)
-	if (host_initialized || !strcasecmp(cmd_argv[0], "exec"))
+	if (host_initialized || !strcasecmp(cmd_argv[0], "exec") || !strcasecmp(cmd_argv[0], "set") || !strcasecmp(cmd_argv[0], "seta"))
 	{
 		for (cmd=cmd_functions ; cmd ; cmd=cmd->next)
 		{