X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cmd.c;h=f8baf9125d79974cb0062e00094f9a36ef889151;hp=b6fab2d29c70c5b36a39126f4c6161028a3f5598;hb=4dd30523a9fba5bb7bcc6f490250e49647d480a9;hpb=e6c842e2406b307ea68920bb496d6ab6214b09bf diff --git a/cmd.c b/cmd.c index b6fab2d2..f8baf912 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 @@ -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,22 @@ 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; + + 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) @@ -666,6 +660,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 +748,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); @@ -962,7 +1001,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; } @@ -1141,18 +1180,20 @@ void Cmd_Init_Commands (void) 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 $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"); + 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 */ // 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 +1639,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) {