X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cmd.c;h=19da28e1b21f1b161f6771b842b2ebc54c1a3897;hb=ccb5fe100fa4f0005123933dcdf4e9d3ad878687;hp=3457a534062c3e92c1da72c5f16c163bfaec428c;hpb=513035b1e1f888ac5c3438e300ea302406d48a13;p=xonotic%2Fdarkplaces.git

diff --git a/cmd.c b/cmd.c
index 3457a534..19da28e1 100644
--- a/cmd.c
+++ b/cmd.c
@@ -21,17 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-#define	MAX_ALIAS_NAME	32
-// this is the largest script file that can be executed in one step
-// LordHavoc: inreased this from 8192 to 32768
-// div0: increased this from 32k to 128k
-// div0: increased this from 128k to 640k which ought to be enough for anyone
-#define CMDBUFSIZE 655360
-// maximum number of parameters to a command
-#define	MAX_ARGS 80
-// maximum tokenizable commandline length (counting NUL terminations)
-#define CMD_TOKENIZELENGTH (MAX_INPUTLINE + MAX_ARGS)
-
 typedef struct cmdalias_s
 {
 	struct cmdalias_s *next;
@@ -465,6 +454,7 @@ Cmd_Exec_f
 static void Cmd_Exec_f (void)
 {
 	char *f;
+	const char *filename;
 
 	if (Cmd_Argc () != 2)
 	{
@@ -472,18 +462,26 @@ static void Cmd_Exec_f (void)
 		return;
 	}
 
-	f = (char *)FS_LoadFile (Cmd_Argv(1), tempmempool, false, NULL);
+	filename = Cmd_Argv(1);
+	if (!strcmp(filename, "config.cfg"))
+	{
+		filename = CONFIGFILENAME;
+		if (COM_CheckParm("-noconfig"))
+			return; // don't execute config.cfg
+	}
+
+	f = (char *)FS_LoadFile (filename, tempmempool, false, NULL);
 	if (!f)
 	{
-		Con_Printf("couldn't exec %s\n",Cmd_Argv(1));
+		Con_Printf("couldn't exec %s\n",filename);
 		return;
 	}
-	Con_Printf("execing %s\n",Cmd_Argv(1));
+	Con_Printf("execing %s\n",filename);
 
 	// if executing default.cfg for the first time, lock the cvar defaults
 	// it may seem backwards to insert this text BEFORE the default.cfg
 	// but Cbuf_InsertText inserts before, so this actually ends up after it.
-	if (!strcmp(Cmd_Argv(1), "default.cfg"))
+	if (strlen(filename) >= 11 && !strcmp(filename + strlen(filename) - 11, "default.cfg"))
 		Cbuf_InsertText("\ncvar_lockdefaults\n");
 
 	// insert newline after the text to make sure the last line is terminated (some text editors omit the trailing newline)
@@ -754,6 +752,10 @@ static const char *Cmd_GetDirectCvarValue(const char *varname, cmdalias_t *alias
 				*is_multiple = true;
 			return Cmd_Args();
 		}
+		else if(!strcmp(varname, "#"))
+		{
+			return va("%d", Cmd_Argc());
+		}
 		else if(varname[strlen(varname) - 1] == '-')
 		{
 			argno = strtol(varname, &endptr, 10);
@@ -1003,7 +1005,7 @@ static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned ma
 					eat = varlen + 1;
 				}
 			} else {
-				varlen = strspn(in, "*0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-");
+				varlen = strspn(in, "#*0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-");
 				val = Cmd_GetCvarValue(in, varlen, alias);
 				eat = varlen;
 			}
@@ -1187,6 +1189,7 @@ void Cmd_Init_Commands (void)
 	Cmd_AddCommand ("wait", Cmd_Wait_f, "make script execution wait for next rendered frame");
 	Cmd_AddCommand ("set", Cvar_Set_f, "create or change the value of a console variable");
 	Cmd_AddCommand ("seta", Cvar_SetA_f, "create or change the value of a console variable that will be saved to config.cfg");
+	Cmd_AddCommand ("unset", Cvar_Del_f, "delete a cvar (does not work for static ones like _cl_name, or read-only ones)");
 #ifdef FILLALLCVARSWITHRUBBISH
 	Cmd_AddCommand ("fillallcvarswithrubbish", Cvar_FillAll_f, "fill all cvars with a specified number of characters to provoke buffer overruns");
 #endif /* FILLALLCVARSWITHRUBBISH */
@@ -1640,7 +1643,6 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src)
 					Con_Printf("Command \"%s\" can not be executed\n", Cmd_Argv(0));
 				found = true;
 				goto command_found;
-				break;
 			case src_client:
 				if (cmd->clientfunction)
 				{