#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;
static void Cmd_Exec_f (void)
{
char *f;
+ const char *filename;
if (Cmd_Argc () != 2)
{
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)
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);
+ }
+}
+
/*
=============================================================================
*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);
static char varval[MAX_INPUTLINE];
const char *varstr;
char *varfunc;
+static char asis[] = "asis"; // just to suppress const char warnings
if(varlen >= MAX_INPUTLINE)
varlen = MAX_INPUTLINE - 1;
varstr = Cmd_GetDirectCvarValue(varname, alias, &is_multiple);
if(is_multiple)
if(!varfunc)
- varfunc = "asis";
+ varfunc = asis;
}
if(!varstr)
eat = varlen + 1;
}
} else {
- varlen = strspn(in, "*0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-");
+ varlen = strspn(in, "#*0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-");
val = Cmd_GetCvarValue(in, varlen, alias);
eat = varlen;
}
cvar_t *cvar;
cmdalias_t *alias;
const char *partial;
- size_t len;
int count;
qboolean ispattern;
if (Cmd_Argc() > 1)
- {
partial = Cmd_Args();
- len = strlen(partial);
- }
else
{
Con_Printf("usage: apropos <string>\n");
ispattern = partial && (strchr(partial, '*') || strchr(partial, '?'));
if(!ispattern)
- {
partial = va("*%s*", partial);
- len += 2;
- }
count = 0;
for (cvar = cvar_vars; cvar; cvar = cvar->next)
}
for (alias = cmd_alias; alias; alias = alias->next)
{
+ // procede here a bit differently as an alias value always got a final \n
if (!matchpattern_with_separator(alias->name, partial, true, "", false))
- if (!matchpattern_with_separator(alias->value, partial, true, "", false))
+ if (!matchpattern_with_separator(alias->value, partial, true, "\n", false)) // when \n is as separator wildcards don't match it
continue;
- Con_Printf("alias ^5%s^7: %s", alias->name, alias->value);
+ Con_Printf("alias ^5%s^7: %s", alias->name, alias->value); // do not print an extra \n
count++;
}
Con_Printf("%i result%s\n\n", count, (count > 1) ? "s" : "");
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");
Con_Printf("Command \"%s\" can not be executed\n", Cmd_Argv(0));
found = true;
goto command_found;
- break;
case src_client:
if (cmd->clientfunction)
{