X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cmd.c;h=3457a534062c3e92c1da72c5f16c163bfaec428c;hp=b0d6a9e14f9b038238aa5e27b387afc9dd60d6fd;hb=6b4d3728652cac9b8af676a73019e10d74787d00;hpb=142a53c72294b2f9aacc8830f9f04b108da50567

diff --git a/cmd.c b/cmd.c
index b0d6a9e1..3457a534 100644
--- a/cmd.c
+++ b/cmd.c
@@ -321,7 +321,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 +666,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);
+	}
+}
+
 /*
 =============================================================================
 
@@ -876,7 +917,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;
@@ -983,9 +1024,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,16 +1181,20 @@ 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");
 	Cmd_AddCommand ("seta", Cvar_SetA_f, "create or change the value of a console variable that will be saved to config.cfg");
+#ifdef FILLALLCVARSWITHRUBBISH
+	Cmd_AddCommand ("fillallcvarswithrubbish", Cvar_FillAll_f, "fill all cvars with a specified number of characters to provoke buffer overruns");
+#endif /* FILLALLCVARSWITHRUBBISH */
 
 	// 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");