X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cmd.c;h=d68a289a90822fad3396b7c471fa483ee89a30f2;hb=e25ec73b388ad038b3999b26d70c03c4a1b9c482;hp=fad9aa4d5b4a51991be26e8ca67aa074cac2d936;hpb=98820ee06a14eab83ede762cb32af9eaf3ca46ce;p=xonotic%2Fdarkplaces.git

diff --git a/cmd.c b/cmd.c
index fad9aa4d..d68a289a 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;
@@ -321,7 +310,7 @@ void Cbuf_Execute (void)
 				}
 				else
 				{
-					if(text[i] == '/' && text[i + 1] == '/')
+					if(text[i] == '/' && text[i + 1] == '/' && (i == 0 || ISWHITESPACE(text[i-1])))
 						comment = true;
 					if(text[i] == ';')
 						break;	// don't break if inside a quoted string or comment
@@ -666,6 +655,47 @@ static void Cmd_Alias_f (void)
 	memcpy (a->value, cmd, alloclen);
 }
 
+/*
+===============
+Cmd_UnAlias_f
+
+Remove existing aliases.
+===============
+*/
+static void Cmd_UnAlias_f (void)
+{
+	cmdalias_t	*a, *p;
+	int i;
+	const char *s;
+
+	if(Cmd_Argc() == 1)
+	{
+		Con_Print("unalias: Usage: unalias alias1 [alias2 ...]\n");
+		return;
+	}
+
+	for(i = 1; i < Cmd_Argc(); ++i)
+	{
+		s = Cmd_Argv(i);
+		p = NULL;
+		for(a = cmd_alias; a; p = a, a = a->next)
+		{
+			if(!strcmp(s, a->name))
+			{
+				if(a == cmd_alias)
+					cmd_alias = a->next;
+				if(p)
+					p->next = a->next;
+				Z_Free(a->value);
+				Z_Free(a);
+				break;
+			}
+		}
+		if(!a)
+			Con_Printf("unalias: %s alias not found\n", s);
+	}
+}
+
 /*
 =============================================================================
 
@@ -713,6 +743,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);
@@ -876,7 +910,7 @@ static const char *Cmd_GetCvarValue(const char *var, size_t varlen, cmdalias_t *
 /*
 Cmd_PreprocessString
 
-Preprocesses strings and replaces $*, $param#, $cvar accordingly
+Preprocesses strings and replaces $*, $param#, $cvar accordingly. Also strips comments.
 */
 static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned maxoutlen, cmdalias_t *alias ) {
 	const char *in;
@@ -962,7 +996,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;
 			}
@@ -983,9 +1017,9 @@ static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned ma
 					--eat;
 				}
 			}
-		} else {
-			outtext[outlen++] = *in++;
 		}
+		else 
+			outtext[outlen++] = *in++;
 	}
 	outtext[outlen] = 0;
 }
@@ -1140,7 +1174,8 @@ void Cmd_Init_Commands (void)
 	Cmd_AddCommand ("stuffcmds",Cmd_StuffCmds_f, "execute commandline parameters (must be present in quake.rc script)");
 	Cmd_AddCommand ("exec",Cmd_Exec_f, "execute a script file");
 	Cmd_AddCommand ("echo",Cmd_Echo_f, "print a message to the console (useful in scripts)");
-	Cmd_AddCommand ("alias",Cmd_Alias_f, "create a script function (parameters are passed in as $1 through $9, and $* for all parameters)");
+	Cmd_AddCommand ("alias",Cmd_Alias_f, "create a script function (parameters are passed in as $X (being X a number), $* for all parameters, $X- for all parameters starting from $X). Without arguments show the list of all alias");
+	Cmd_AddCommand ("unalias",Cmd_UnAlias_f, "remove an alias");
 	Cmd_AddCommand ("cmd", Cmd_ForwardToServer, "send a console commandline to the server (used by some mods)");
 	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");
@@ -1151,8 +1186,8 @@ void Cmd_Init_Commands (void)
 
 	// 2000-01-09 CmdList, CvarList commands By Matthias "Maddes" Buecher
 	// Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com
-	Cmd_AddCommand ("cmdlist", Cmd_List_f, "lists all console commands beginning with the specified prefix");
-	Cmd_AddCommand ("cvarlist", Cvar_List_f, "lists all console variables beginning with the specified prefix");
+	Cmd_AddCommand ("cmdlist", Cmd_List_f, "lists all console commands beginning with the specified prefix or matching the specified wildcard pattern");
+	Cmd_AddCommand ("cvarlist", Cvar_List_f, "lists all console variables beginning with the specified prefix or matching the specified wildcard pattern");
 	Cmd_AddCommand ("apropos", Cmd_Apropos_f, "lists all console variables/commands/aliases containing the specified string in the name or description");
 
 	Cmd_AddCommand ("cvar_lockdefaults", Cvar_LockDefaults_f, "stores the current values of all cvars into their default values, only used once during startup after parsing default.cfg");
@@ -1598,7 +1633,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)
 				{