#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
-#define CMDBUFSIZE 32768
+// div0: increased this from 32k to 128k
+#define CMDBUFSIZE 131072
// maximum number of parameters to a command
#define MAX_ARGS 80
// maximum tokenizable commandline length (counting NUL terminations)
-#define CMD_TOKENIZELENGTH (MAX_INPUTLINE + 80)
+#define CMD_TOKENIZELENGTH (MAX_INPUTLINE + MAX_ARGS)
typedef struct cmdalias_s
{
cmd_wait = true;
}
+typedef struct cmddeferred_s
+{
+ struct cmddeferred_s *next;
+ char *value;
+ double time;
+} cmddeferred_t;
+
+static cmddeferred_t *cmd_deferred_list;
+
+/*
+============
+Cmd_Defer_f
+
+Cause a command to be executed after a delay.
+============
+*/
+static void Cmd_Defer_f (void)
+{
+ if(Cmd_Argc() == 1)
+ {
+ double time = Sys_DoubleTime();
+ cmddeferred_t *next = cmd_deferred_list;
+ if(!next)
+ Con_Printf("No commands are pending.\n");
+ while(next)
+ {
+ Con_Printf("-> In %'9.2f: %s\n", next->time-time, next->value);
+ next = next->next;
+ }
+ } else if(Cmd_Argc() != 3)
+ {
+ Con_Printf("usage: defer <seconds> <command>\n");
+ return;
+ } else {
+ const char *value = Cmd_Argv(2);
+ cmddeferred_t *defcmd = (cmddeferred_t*)Mem_Alloc(tempmempool, sizeof(*defcmd));
+ unsigned int len = strlen(value);
+
+ defcmd->time = Sys_DoubleTime() + atof(Cmd_Argv(1));
+ defcmd->value = (char*)Mem_Alloc(tempmempool, len+1);
+ memcpy(defcmd->value, value, len);
+ defcmd->value[len] = 0;
+
+ defcmd->next = cmd_deferred_list;
+ cmd_deferred_list = defcmd;
+ }
+}
+
+/*
+============
+Cmd_Centerprint_f
+
+Print something to the center of the screen using SCR_Centerprint
+============
+*/
+static void Cmd_Centerprint_f (void)
+{
+ char msg[MAX_INPUTLINE];
+ unsigned int i, c, p;
+ c = Cmd_Argc();
+ if(c >= 2)
+ {
+ strlcpy(msg, Cmd_Argv(1), sizeof(msg));
+ for(i = 2; i < c; ++i)
+ {
+ strlcat(msg, " ", sizeof(msg));
+ strlcat(msg, Cmd_Argv(i), sizeof(msg));
+ }
+ c = strlen(msg);
+ for(p = 0, i = 0; i < c; ++i)
+ {
+ if(msg[i] == '\\')
+ {
+ if(msg[i+1] == 'n')
+ msg[p++] = '\n';
+ else if(msg[i+1] == '\\')
+ msg[p++] = '\\';
+ else {
+ msg[p++] = '\\';
+ msg[p++] = msg[i+1];
+ }
+ ++i;
+ } else {
+ msg[p++] = msg[i];
+ }
+ }
+ msg[p] = '\0';
+ SCR_CenterPrint(msg);
+ }
+}
+
/*
=============================================================================
}
}
+/*
+============
+Cbuf_Execute_Deferred --blub
+============
+*/
+void Cbuf_Execute_Deferred (void)
+{
+ cmddeferred_t *cmd, *prev;
+ double time = Sys_DoubleTime();
+ prev = NULL;
+ cmd = cmd_deferred_list;
+ while(cmd)
+ {
+ if(cmd->time <= time)
+ {
+ Cbuf_AddText(cmd->value);
+ Mem_Free(cmd->value);
+
+ if(prev)
+ prev->next = cmd->next;
+ else
+ cmd_deferred_list = cmd->next;
+
+ Mem_Free(cmd);
+
+ cmd = prev;
+ if(!cmd)
+ return;
+ }
+ prev = cmd;
+ cmd = cmd->next;
+ }
+}
+
/*
============
Cbuf_Execute
// LordHavoc: making sure the tokenizebuffer doesn't get filled up by repeated crashes
cmd_tokenizebufferpos = 0;
+ Cbuf_Execute_Deferred();
while (cmd_text.cursize)
{
// find a \n or ; line break
{
if (text[i] == '"')
quotes ^= 1;
- if (text[i] == '\\' && (text[i+1] == '"' || text[i+1] == '\\'))
+ // make sure i doesn't get > cursize which causes a negative
+ // size in memmove, which is fatal --blub
+ if (i < (cmd_text.cursize-1) && (text[i] == '\\' && (text[i+1] == '"' || text[i+1] == '\\')))
i++;
if ( !quotes && text[i] == ';')
break; // don't break if inside a quoted string
break;
}
- memcpy (line, text, i);
- line[i] = 0;
+ // better than CRASHING on overlong input lines that may SOMEHOW enter the buffer
+ if(i >= MAX_INPUTLINE)
+ {
+ Con_Printf("Warning: console input buffer had an overlong line. Ignored.\n");
+ line[0] = 0;
+ }
+ else
+ {
+ memcpy (line, text, i);
+ line[i] = 0;
+ }
// delete the text from the command buffer and move remaining commands down
// this is necessary because commands (exec, alias) can insert data at the
{
i++;
cmd_text.cursize -= i;
- memcpy (cmd_text.data, text+i, cmd_text.cursize);
+ memmove (cmd_text.data, text+i, cmd_text.cursize);
}
// execute the command line
Con_Printf("couldn't exec %s\n",Cmd_Argv(1));
return;
}
- Con_DPrintf("execing %s\n",Cmd_Argv(1));
+ Con_Printf("execing %s\n",Cmd_Argv(1));
// if executing default.cfg for the first time, lock the cvar defaults
// it may seem backwards to insert this text BEFORE the default.cfg
}
else
{ // Invalid CVar
- Con_Printf("ERROR : CVar '%s' not found\n", Cmd_Argv(2) );
+ Con_Printf("ERROR : CVar '%s' not found\n", Cmd_Argv(1) );
}
}
}
static cmd_function_t *cmd_functions; // possible commands to execute
-static const char *Cmd_GetDirectCvarValue(const char *varname, cmdalias_t *alias)
+static const char *Cmd_GetDirectCvarValue(const char *varname, cmdalias_t *alias, qboolean *is_multiple)
{
cvar_t *cvar;
long argno;
char *endptr;
+ if(is_multiple)
+ *is_multiple = false;
+
if(!varname || !*varname)
return NULL;
if(alias)
{
if(!strcmp(varname, "*"))
+ {
+ if(is_multiple)
+ *is_multiple = true;
return Cmd_Args();
+ }
+ else if(varname[strlen(varname) - 1] == '-')
+ {
+ argno = strtol(varname, &endptr, 10);
+ if(endptr == varname + strlen(varname) - 1)
+ {
+ // whole string is a number, apart from the -
+ const char *p = Cmd_Args();
+ for(; argno > 1; --argno)
+ if(!COM_ParseToken_Console(&p))
+ break;
+ if(p)
+ {
+ if(is_multiple)
+ *is_multiple = true;
+
+ // kill pre-argument whitespace
+ for (;*p && *p <= ' ';p++)
+ ;
+
+ return p;
+ }
+ }
+ }
else
{
argno = strtol(varname, &endptr, 10);
return NULL;
}
+qboolean Cmd_QuoteString(char *out, size_t outlen, const char *in, const char *quoteset)
+{
+ qboolean quote_quot = !!strchr(quoteset, '"');
+ qboolean quote_backslash = !!strchr(quoteset, '\\');
+ qboolean quote_dollar = !!strchr(quoteset, '$');
+
+ while(*in)
+ {
+ if(*in == '"' && quote_quot)
+ {
+ if(outlen <= 2)
+ {
+ *out++ = 0;
+ return false;
+ }
+ *out++ = '\\'; --outlen;
+ *out++ = '"'; --outlen;
+ }
+ else if(*in == '\\' && quote_backslash)
+ {
+ if(outlen <= 2)
+ {
+ *out++ = 0;
+ return false;
+ }
+ *out++ = '\\'; --outlen;
+ *out++ = '\\'; --outlen;
+ }
+ else if(*in == '$' && quote_dollar)
+ {
+ if(outlen <= 2)
+ {
+ *out++ = 0;
+ return false;
+ }
+ *out++ = '$'; --outlen;
+ *out++ = '$'; --outlen;
+ }
+ else
+ {
+ if(outlen <= 1)
+ {
+ *out++ = 0;
+ return false;
+ }
+ *out++ = *in; --outlen;
+ }
+ ++in;
+ }
+ *out++ = 0;
+ return true;
+}
+
static const char *Cmd_GetCvarValue(const char *var, size_t varlen, cmdalias_t *alias)
{
static char varname[MAX_INPUTLINE];
static char varval[MAX_INPUTLINE];
- char *p;
const char *varstr;
char *varfunc;
varstr = NULL;
- // Exception: $* doesn't use the quoted form by default
- if(!strcmp(varname, "*"))
- varfunc = "asis";
-
if(varname[0] == '$')
- varstr = Cmd_GetDirectCvarValue(Cmd_GetDirectCvarValue(varname + 1, alias), alias);
+ varstr = Cmd_GetDirectCvarValue(Cmd_GetDirectCvarValue(varname + 1, alias, NULL), alias, NULL);
else
- varstr = Cmd_GetDirectCvarValue(varname, alias);
+ {
+ qboolean is_multiple = false;
+ // Exception: $* and $n- don't use the quoted form by default
+ varstr = Cmd_GetDirectCvarValue(varname, alias, &is_multiple);
+ if(is_multiple)
+ varfunc = "asis";
+ }
if(!varstr)
{
if(!varfunc || !strcmp(varfunc, "q")) // note: quoted form is default, use "asis" to override!
{
// quote it so it can be used inside double quotes
- // we just need to replace " by \"
- p = varval;
- while(*varstr)
- {
- if(*varstr == '"')
- {
- if(p - varval >= (ssize_t)(sizeof(varval) - 2))
- break;
- *p++ = '\\';
- *p++ = '"';
- }
- else if(*varstr == '\\')
- {
- if(p - varval >= (ssize_t)(sizeof(varval) - 2))
- break;
- *p++ = '\\';
- *p++ = '\\';
- }
- else
- {
- if(p - varval >= (ssize_t)(sizeof(varval) - 1))
- break;
- *p++ = *varstr;
- }
- ++varstr;
- }
- *p++ = 0;
- //Con_Printf("quoted form: %s\n", varval);
+ // we just need to replace " by \", and of course, double backslashes
+ Cmd_QuoteString(varval, sizeof(varval), varstr, "\"\\");
return varval;
}
else if(!strcmp(varfunc, "asis"))
// alias parameter, where the name of the alias is $0, the first
// parameter is $1 and so on; as a special case, $* inserts all
// parameters, without extra quoting, so one can use $* to just
- // pass all parameters around
+ // pass all parameters around. All parameters starting from $n
+ // can be referred to as $n- (so $* is equivalent to $1-).
//
// Note: when expanding an alias, cvar expansion is done in the SAME step
// as alias expansion so that alias parameters or cvar values containing
eat = varlen + 1;
}
} else {
- varlen = strspn(in, "*0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_");
+ varlen = strspn(in, "*0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-");
val = Cmd_GetCvarValue(in, varlen, alias);
eat = varlen;
}
*/
static void Cmd_ExecuteAlias (cmdalias_t *alias)
{
- static char buffer[ MAX_INPUTLINE + 2 ];
- static char buffer2[ MAX_INPUTLINE * 2 + 2 ];
- char *q;
- const char *p;
+ static char buffer[ MAX_INPUTLINE ];
+ static char buffer2[ MAX_INPUTLINE ];
Cmd_PreprocessString( alias->value, buffer, sizeof(buffer) - 2, alias );
// insert at start of command buffer, so that aliases execute in order
// (fixes bug introduced by Black on 20050705)
-
+
// Note: Cbuf_PreprocessString will be called on this string AGAIN! So we
// have to make sure that no second variable expansion takes place, otherwise
// alias parameters containing dollar signs can have bad effects.
- for(p = buffer, q = buffer2; *p; )
- {
- if(*p == '$')
- *q++ = '$';
- *q++ = *p++;
- }
- *q++ = 0;
-
+ Cmd_QuoteString(buffer2, sizeof(buffer2), buffer, "$");
Cbuf_InsertText( buffer2 );
}
Cmd_AddCommand ("cvar_resettodefaults_nosaveonly", Cvar_ResetToDefaults_NoSaveOnly_f, "sets all non-saved cvars to their locked default values (variables that will not be saved to config.cfg)");
Cmd_AddCommand ("cvar_resettodefaults_saveonly", Cvar_ResetToDefaults_SaveOnly_f, "sets all saved cvars to their locked default values (variables that will be saved to config.cfg)");
+ Cmd_AddCommand ("cprint", Cmd_Centerprint_f, "print something at the screen center");
+ Cmd_AddCommand ("defer", Cmd_Defer_f, "execute a command in the future");
+
// DRESK - 5/14/06
// Support Doom3-style Toggle Command
Cmd_AddCommand( "toggle", Cmd_Toggle_f, "toggles a console variable's values (use for more info)");