This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
#include "quakedef.h"
-void Cmd_ForwardToServer (void);
-
#define MAX_ALIAS_NAME 32
typedef struct cmdalias_s
{
- struct cmdalias_s *next;
- char name[MAX_ALIAS_NAME];
- char *value;
+ struct cmdalias_s *next;
+ char name[MAX_ALIAS_NAME];
+ char *value;
} cmdalias_t;
-cmdalias_t *cmd_alias;
+static cmdalias_t *cmd_alias;
+
+static qboolean cmd_wait;
-int trashtest;
-int *trashspot;
+static mempool_t *cmd_mempool;
-qboolean cmd_wait;
+#define CMD_TOKENIZELENGTH 4096
+static char cmd_tokenizebuffer[CMD_TOKENIZELENGTH];
+static int cmd_tokenizebufferpos = 0;
//=============================================================================
bind g "impulse 5 ; +attack ; wait ; -attack ; impulse 2"
============
*/
-void Cmd_Wait_f (void)
+static void Cmd_Wait_f (void)
{
cmd_wait = true;
}
=============================================================================
*/
-sizebuf_t cmd_text;
-
-/*
-============
-Cbuf_Init
-============
-*/
-void Cbuf_Init (void)
-{
- SZ_Alloc (&cmd_text, 8192); // space for commands and script files
-}
-
+ // LordHavoc: inreased this from 8192 to 32768
+static sizebuf_t cmd_text;
+static qbyte cmd_text_buf[32768];
/*
============
Adds command text at the end of the buffer
============
*/
-void Cbuf_AddText (char *text)
+void Cbuf_AddText (const char *text)
{
int l;
-
- l = strlen (text);
+
+ l = (int)strlen (text);
if (cmd_text.cursize + l >= cmd_text.maxsize)
{
- Con_Printf ("Cbuf_AddText: overflow\n");
+ Con_Print("Cbuf_AddText: overflow\n");
return;
}
- SZ_Write (&cmd_text, text, strlen (text));
+ SZ_Write (&cmd_text, text, (int)strlen (text));
}
FIXME: actually change the command buffer to do less copying
============
*/
-void Cbuf_InsertText (char *text)
+void Cbuf_InsertText (const char *text)
{
char *temp;
int templen;
-// copy off any commands still remaining in the exec buffer
+ // copy off any commands still remaining in the exec buffer
templen = cmd_text.cursize;
if (templen)
{
- temp = Z_Malloc (templen);
+ temp = Mem_Alloc (tempmempool, templen);
memcpy (temp, cmd_text.data, templen);
SZ_Clear (&cmd_text);
}
else
- temp = NULL; // shut up compiler
-
-// add the entire text of the file
+ temp = NULL;
+
+ // add the entire text of the file
Cbuf_AddText (text);
-
-// add the copied off data
- if (templen)
+
+ // add the copied off data
+ if (temp != NULL)
{
SZ_Write (&cmd_text, temp, templen);
- Z_Free (temp);
+ Mem_Free (temp);
}
}
*/
void Cbuf_Execute (void)
{
- int i;
- char *text;
- char line[1024];
- int quotes;
-
+ int i;
+ char *text;
+ char line[1024];
+ int quotes;
+
+ // LordHavoc: making sure the tokenizebuffer doesn't get filled up by repeated crashes
+ cmd_tokenizebufferpos = 0;
+
while (cmd_text.cursize)
{
// find a \n or ; line break
quotes++;
if ( !(quotes&1) && text[i] == ';')
break; // don't break if inside a quoted string
- if (text[i] == '\n')
+ if (text[i] == '\r' || text[i] == '\n')
break;
}
-
-
+
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
// beginning of the text buffer
{
i++;
cmd_text.cursize -= i;
- memcpy (text, text+i, cmd_text.cursize);
+ memcpy (cmd_text.data, text+i, cmd_text.cursize);
}
// execute the command line
Cmd_ExecuteString (line, src_command);
-
+
if (cmd_wait)
{ // skip out while text still remains in buffer, leaving it
// for next frame
quake -nosound +cmd amlev1
===============
*/
+qboolean host_stuffcmdsrun = false;
void Cmd_StuffCmds_f (void)
{
- int i, j;
- int s;
- char *text, *build, c;
-
+ int i, j, l;
+ // this is per command, and bounds checked (no buffer overflows)
+ char build[2048];
+
if (Cmd_Argc () != 1)
{
- Con_Printf ("stuffcmds : execute command line parameters\n");
+ Con_Print("stuffcmds : execute command line parameters\n");
return;
}
-// build the combined string to parse from
- s = 0;
- for (i=1 ; i<com_argc ; i++)
- {
- if (!com_argv[i])
- continue; // NEXTSTEP nulls out -NXHost
- s += strlen (com_argv[i]) + 1;
- }
- if (!s)
- return;
-
- text = Z_Malloc (s+1);
- text[0] = 0;
- for (i=1 ; i<com_argc ; i++)
+ host_stuffcmdsrun = true;
+ for (i = 0;i < com_argc;i++)
{
- if (!com_argv[i])
- continue; // NEXTSTEP nulls out -NXHost
- strcat (text,com_argv[i]);
- if (i != com_argc-1)
- strcat (text, " ");
- }
-
-// pull out the commands
- build = Z_Malloc (s+1);
- build[0] = 0;
-
- for (i=0 ; i<s-1 ; i++)
- {
- if (text[i] == '+')
+ if (com_argv[i] && com_argv[i][0] == '+' && (com_argv[i][1] < '0' || com_argv[i][1] > '9'))
{
+ l = 0;
+ j = 1;
+ while (com_argv[i][j])
+ build[l++] = com_argv[i][j++];
i++;
-
- for (j=i ; (text[j] != '+') && (text[j] != '-') && (text[j] != 0) ; j++)
- ;
-
- c = text[j];
- text[j] = 0;
-
- strcat (build, text+i);
- strcat (build, "\n");
- text[j] = c;
- i = j-1;
+ for (;i < com_argc;i++)
+ {
+ if (!com_argv[i])
+ continue;
+ if ((com_argv[i][0] == '+' || com_argv[i][0] == '-') && (com_argv[i][1] < '0' || com_argv[i][1] > '9'))
+ break;
+ if (l + strlen(com_argv[i]) + 5 > sizeof(build))
+ break;
+ build[l++] = ' ';
+ build[l++] = '\"';
+ for (j = 0;com_argv[i][j];j++)
+ build[l++] = com_argv[i][j];
+ build[l++] = '\"';
+ }
+ build[l++] = '\n';
+ build[l++] = 0;
+ Cbuf_InsertText (build);
+ i--;
}
}
-
- if (build[0])
- Cbuf_InsertText (build);
-
- Z_Free (text);
- Z_Free (build);
}
Cmd_Exec_f
===============
*/
-void Cmd_Exec_f (void)
+static void Cmd_Exec_f (void)
{
- char *f;
- int mark;
+ char *f;
if (Cmd_Argc () != 2)
{
- Con_Printf ("exec <filename> : execute a script file\n");
+ Con_Print("exec <filename> : execute a script file\n");
return;
}
- mark = Hunk_LowMark ();
- f = (char *)COM_LoadHunkFile (Cmd_Argv(1), false);
+ f = (char *)FS_LoadFile (Cmd_Argv(1), tempmempool, false);
if (!f)
{
- Con_Printf ("couldn't exec %s\n",Cmd_Argv(1));
+ Con_Printf("couldn't exec %s\n",Cmd_Argv(1));
return;
}
- Con_Printf ("execing %s\n",Cmd_Argv(1));
-
+ Con_DPrintf("execing %s\n",Cmd_Argv(1));
+
Cbuf_InsertText (f);
- Hunk_FreeToLowMark (mark);
+ Mem_Free(f);
}
Just prints the rest of the line to the console
===============
*/
-void Cmd_Echo_f (void)
+static void Cmd_Echo_f (void)
{
int i;
-
+
for (i=1 ; i<Cmd_Argc() ; i++)
- Con_Printf ("%s ",Cmd_Argv(i));
- Con_Printf ("\n");
+ Con_Printf("%s ",Cmd_Argv(i));
+ Con_Print("\n");
}
/*
Creates a new command that executes a command string (possibly ; seperated)
===============
*/
-
-char *CopyString (char *in)
-{
- char *out;
-
- out = Z_Malloc (strlen(in)+1);
- strcpy (out, in);
- return out;
-}
-
-void Cmd_Alias_f (void)
+static void Cmd_Alias_f (void)
{
cmdalias_t *a;
char cmd[1024];
int i, c;
- char *s;
+ const char *s;
if (Cmd_Argc() == 1)
{
- Con_Printf ("Current alias commands:\n");
+ Con_Print("Current alias commands:\n");
for (a = cmd_alias ; a ; a=a->next)
- Con_Printf ("%s : %s\n", a->name, a->value);
+ Con_Printf("%s : %s\n", a->name, a->value);
return;
}
s = Cmd_Argv(1);
if (strlen(s) >= MAX_ALIAS_NAME)
{
- Con_Printf ("Alias name is too long\n");
+ Con_Print("Alias name is too long\n");
return;
}
- // if the alias allready exists, reuse it
+ // if the alias already exists, reuse it
for (a = cmd_alias ; a ; a=a->next)
{
if (!strcmp(s, a->name))
if (!a)
{
+ cmdalias_t *prev, *current;
+
a = Z_Malloc (sizeof(cmdalias_t));
- a->next = cmd_alias;
- cmd_alias = a;
+ strlcpy (a->name, s, sizeof (a->name));
+ // insert it at the right alphanumeric position
+ for( prev = NULL, current = cmd_alias ; current && strcmp( current->name, a->name ) < 0 ; prev = current, current = current->next )
+ ;
+ if( prev ) {
+ prev->next = a;
+ } else {
+ cmd_alias = a;
+ }
+ a->next = current;
}
- strcpy (a->name, s);
+
// copy the rest of the command line
cmd[0] = 0; // start out with a null string
c = Cmd_Argc();
for (i=2 ; i< c ; i++)
{
- strcat (cmd, Cmd_Argv(i));
+ strlcat (cmd, Cmd_Argv(i), sizeof (cmd));
if (i != c)
- strcat (cmd, " ");
+ strlcat (cmd, " ", sizeof (cmd));
}
- strcat (cmd, "\n");
-
- a->value = CopyString (cmd);
+ strlcat (cmd, "\n", sizeof (cmd));
+
+ a->value = Z_Malloc (strlen (cmd) + 1);
+ strcpy (a->value, cmd);
}
/*
typedef struct cmd_function_s
{
- struct cmd_function_s *next;
- char *name;
- xcommand_t function;
+ struct cmd_function_s *next;
+ const char *name;
+ xcommand_t function;
} cmd_function_t;
#define MAX_ARGS 80
-static int cmd_argc;
-static char *cmd_argv[MAX_ARGS];
-static char *cmd_null_string = "";
-static char *cmd_args = NULL;
+static int cmd_argc;
+static const char *cmd_argv[MAX_ARGS];
+static const char *cmd_null_string = "";
+static const char *cmd_args = NULL;
-cmd_source_t cmd_source;
+cmd_source_t cmd_source;
-static cmd_function_t *cmd_functions; // possible commands to execute
+static cmd_function_t *cmd_functions; // possible commands to execute
+
+/*
+============
+Cmd_ExecuteAlias
+
+Called for aliases and fills in the alias into the cbuffer
+============
+*/
+static void Cmd_ExecuteAlias (cmdalias_t *alias)
+{
+ const char *text = alias->value;
+
+ while( COM_ParseTokenConsole( &text ) )
+ {
+ Cbuf_AddText( "\"" );
+
+ if( com_token[0] == '$' )
+ {
+ int argNum;
+ argNum = atoi( &com_token[1] );
+
+ // no number at all?
+ if( argNum == 0 )
+ {
+ Cbuf_AddText( com_token );
+ }
+ else if( argNum >= Cmd_Argc() )
+ {
+ Con_Printf( "Warning: Not enough parameters passed to alias '%s', at least %i expected:\n %s\n", alias->name, argNum, alias->value );
+ Cbuf_AddText( com_token );
+ }
+ else
+ {
+ Cbuf_AddText( Cmd_Argv( argNum ) );
+ }
+ }
+ else
+ {
+ Cbuf_AddText( com_token );
+ }
+
+ Cbuf_AddText( "\"" );
+ }
+ Cbuf_AddText( "\n" );
+}
+
+/*
+========
+Cmd_List
+
+ CmdList Added by EvilTypeGuy eviltypeguy@qeradiant.com
+ Thanks to Matthias "Maddes" Buecher, http://www.inside3d.com/qip/
+
+========
+*/
+static void Cmd_List_f (void)
+{
+ cmd_function_t *cmd;
+ const char *partial;
+ int len, count;
+
+ if (Cmd_Argc() > 1)
+ {
+ partial = Cmd_Argv (1);
+ len = (int)strlen(partial);
+ }
+ else
+ {
+ partial = NULL;
+ len = 0;
+ }
+
+ count = 0;
+ for (cmd = cmd_functions; cmd; cmd = cmd->next)
+ {
+ if (partial && strncmp(partial, cmd->name, len))
+ continue;
+ Con_Printf("%s\n", cmd->name);
+ count++;
+ }
+
+ Con_Printf("%i Command%s", count, (count > 1) ? "s" : "");
+ if (partial)
+ Con_Printf(" beginning with \"%s\"", partial);
+
+ Con_Print("\n\n");
+}
/*
============
============
*/
void Cmd_Init (void)
+{
+ cmd_mempool = Mem_AllocPool("commands", 0, NULL);
+ // space for commands and script files
+ cmd_text.data = cmd_text_buf;
+ cmd_text.maxsize = sizeof(cmd_text_buf);
+ cmd_text.cursize = 0;
+}
+
+void Cmd_Init_Commands (void)
{
//
// register our commands
Cmd_AddCommand ("alias",Cmd_Alias_f);
Cmd_AddCommand ("cmd", Cmd_ForwardToServer);
Cmd_AddCommand ("wait", Cmd_Wait_f);
+ Cmd_AddCommand ("cmdlist", Cmd_List_f); // Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com
+ Cmd_AddCommand ("cvarlist", Cvar_List_f); // 2000-01-09 CmdList, CvarList commands
+ // By Matthias "Maddes" Buecher
+ Cmd_AddCommand ("set", Cvar_Set_f);
+ Cmd_AddCommand ("seta", Cvar_SetA_f);
+}
+
+/*
+============
+Cmd_Shutdown
+============
+*/
+void Cmd_Shutdown(void)
+{
+ Mem_FreePool(&cmd_mempool);
}
/*
Cmd_Argv
============
*/
-char *Cmd_Argv (int arg)
+const char *Cmd_Argv (int arg)
{
if (arg >= cmd_argc )
return cmd_null_string;
- return cmd_argv[arg];
+ return cmd_argv[arg];
}
/*
Cmd_Args
============
*/
-char *Cmd_Args (void)
+const char *Cmd_Args (void)
{
return cmd_args;
}
Parses the given string into command line tokens.
============
*/
-void Cmd_TokenizeString (char *text)
+static void Cmd_TokenizeString (const char *text)
{
- int i;
-
-// clear the args from the last string
- for (i=0 ; i<cmd_argc ; i++)
- Z_Free (cmd_argv[i]);
-
+ int l;
+
cmd_argc = 0;
cmd_args = NULL;
-
+
while (1)
{
-// skip whitespace up to a /n
- while (*text && *text <= ' ' && *text != '\n')
- {
+ // skip whitespace up to a /n
+ while (*text && *text <= ' ' && *text != '\r' && *text != '\n')
text++;
- }
-
- if (*text == '\n')
- { // a newline seperates commands in the buffer
+
+ // line endings:
+ // UNIX: \n
+ // Mac: \r
+ // Windows: \r\n
+ if (*text == '\n' || *text == '\r')
+ {
+ // a newline seperates commands in the buffer
+ if (*text == '\r' && text[1] == '\n')
+ text++;
text++;
break;
}
if (!*text)
return;
-
+
if (cmd_argc == 1)
cmd_args = text;
-
- text = COM_Parse (text);
- if (!text)
+
+ if (!COM_ParseTokenConsole(&text))
return;
+ // check for $cvar
+ // (perhaps use another target buffer?)
+ if (com_token[0] == '$' && com_token[1])
+ {
+ cvar_t *cvar;
+
+ cvar = Cvar_FindVar(&com_token[1]);
+ if (cvar)
+ {
+ strcpy(com_token, cvar->string);
+ }
+ else if( com_token[1] == '$' )
+ {
+ // remove the first $
+ char *pos;
+
+ for( pos = com_token ; *pos ; pos++ )
+ {
+ *pos = *(pos + 1);
+ }
+ }
+ }
+
if (cmd_argc < MAX_ARGS)
{
- cmd_argv[cmd_argc] = Z_Malloc (strlen(com_token)+1);
- strcpy (cmd_argv[cmd_argc], com_token);
+ l = (int)strlen(com_token) + 1;
+ if (cmd_tokenizebufferpos + l > CMD_TOKENIZELENGTH)
+ {
+ Con_Printf("Cmd_TokenizeString: ran out of %i character buffer space for command arguements\n", CMD_TOKENIZELENGTH);
+ break;
+ }
+ strcpy (cmd_tokenizebuffer + cmd_tokenizebufferpos, com_token);
+ cmd_argv[cmd_argc] = cmd_tokenizebuffer + cmd_tokenizebufferpos;
+ cmd_tokenizebufferpos += l;
cmd_argc++;
}
}
-
}
Cmd_AddCommand
============
*/
-void Cmd_AddCommand (char *cmd_name, xcommand_t function)
+void Cmd_AddCommand (const char *cmd_name, xcommand_t function)
{
- cmd_function_t *cmd;
-
- if (host_initialized) // because hunk allocation would get stomped
- Sys_Error ("Cmd_AddCommand after host_initialized");
-
+ cmd_function_t *cmd;
+ cmd_function_t *prev, *current;
+
// fail if the command is a variable name
if (Cvar_VariableString(cmd_name)[0])
{
- Con_Printf ("Cmd_AddCommand: %s already defined as a var\n", cmd_name);
+ Con_Printf("Cmd_AddCommand: %s already defined as a var\n", cmd_name);
return;
}
-
+
// fail if the command already exists
for (cmd=cmd_functions ; cmd ; cmd=cmd->next)
{
if (!strcmp (cmd_name, cmd->name))
{
- Con_Printf ("Cmd_AddCommand: %s already defined\n", cmd_name);
+ Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name);
return;
}
}
- cmd = Hunk_Alloc (sizeof(cmd_function_t));
+ cmd = Mem_Alloc(cmd_mempool, sizeof(cmd_function_t));
cmd->name = cmd_name;
cmd->function = function;
cmd->next = cmd_functions;
- cmd_functions = cmd;
+
+// insert it at the right alphanumeric position
+ for( prev = NULL, current = cmd_functions ; current && strcmp( current->name, cmd->name ) < 0 ; prev = current, current = current->next )
+ ;
+ if( prev ) {
+ prev->next = cmd;
+ } else {
+ cmd_functions = cmd;
+ }
+ cmd->next = current;
}
/*
Cmd_Exists
============
*/
-qboolean Cmd_Exists (char *cmd_name)
+qboolean Cmd_Exists (const char *cmd_name)
{
cmd_function_t *cmd;
for (cmd=cmd_functions ; cmd ; cmd=cmd->next)
- {
if (!strcmp (cmd_name,cmd->name))
return true;
- }
return false;
}
-
/*
============
Cmd_CompleteCommand
============
*/
-char *Cmd_CompleteCommand (char *partial)
+const char *Cmd_CompleteCommand (const char *partial)
{
- cmd_function_t *cmd;
- int len;
-
+ cmd_function_t *cmd;
+ size_t len;
+
len = strlen(partial);
-
+
if (!len)
return NULL;
-
+
// check functions
- for (cmd=cmd_functions ; cmd ; cmd=cmd->next)
- if (!strncmp (partial,cmd->name, len))
+ for (cmd = cmd_functions; cmd; cmd = cmd->next)
+ if (!strncmp(partial, cmd->name, len))
return cmd->name;
return NULL;
}
+/*
+ Cmd_CompleteCountPossible
+
+ New function for tab-completion system
+ Added by EvilTypeGuy
+ Thanks to Fett erich@heintz.com
+ Thanks to taniwha
+
+*/
+int Cmd_CompleteCountPossible (const char *partial)
+{
+ cmd_function_t *cmd;
+ size_t len;
+ int h;
+
+ h = 0;
+ len = strlen(partial);
+
+ if (!len)
+ return 0;
+
+ // Loop through the command list and count all partial matches
+ for (cmd = cmd_functions; cmd; cmd = cmd->next)
+ if (!strncasecmp(partial, cmd->name, len))
+ h++;
+
+ return h;
+}
+
+/*
+ Cmd_CompleteBuildList
+
+ New function for tab-completion system
+ Added by EvilTypeGuy
+ Thanks to Fett erich@heintz.com
+ Thanks to taniwha
+
+*/
+const char **Cmd_CompleteBuildList (const char *partial)
+{
+ cmd_function_t *cmd;
+ size_t len = 0;
+ size_t bpos = 0;
+ size_t sizeofbuf = (Cmd_CompleteCountPossible (partial) + 1) * sizeof (const char *);
+ const char **buf;
+
+ len = strlen(partial);
+ buf = Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *));
+ // Loop through the alias list and print all matches
+ for (cmd = cmd_functions; cmd; cmd = cmd->next)
+ if (!strncasecmp(partial, cmd->name, len))
+ buf[bpos++] = cmd->name;
+
+ buf[bpos] = NULL;
+ return buf;
+}
+
+/*
+ Cmd_CompleteAlias
+
+ New function for tab-completion system
+ Added by EvilTypeGuy
+ Thanks to Fett erich@heintz.com
+ Thanks to taniwha
+
+*/
+const char *Cmd_CompleteAlias (const char *partial)
+{
+ cmdalias_t *alias;
+ size_t len;
+
+ len = strlen(partial);
+
+ if (!len)
+ return NULL;
+
+ // Check functions
+ for (alias = cmd_alias; alias; alias = alias->next)
+ if (!strncasecmp(partial, alias->name, len))
+ return alias->name;
+
+ return NULL;
+}
+
+/*
+ Cmd_CompleteAliasCountPossible
+
+ New function for tab-completion system
+ Added by EvilTypeGuy
+ Thanks to Fett erich@heintz.com
+ Thanks to taniwha
+
+*/
+int Cmd_CompleteAliasCountPossible (const char *partial)
+{
+ cmdalias_t *alias;
+ size_t len;
+ int h;
+
+ h = 0;
+
+ len = strlen(partial);
+
+ if (!len)
+ return 0;
+
+ // Loop through the command list and count all partial matches
+ for (alias = cmd_alias; alias; alias = alias->next)
+ if (!strncasecmp(partial, alias->name, len))
+ h++;
+
+ return h;
+}
+
+/*
+ Cmd_CompleteAliasBuildList
+
+ New function for tab-completion system
+ Added by EvilTypeGuy
+ Thanks to Fett erich@heintz.com
+ Thanks to taniwha
+
+*/
+const char **Cmd_CompleteAliasBuildList (const char *partial)
+{
+ cmdalias_t *alias;
+ size_t len = 0;
+ size_t bpos = 0;
+ size_t sizeofbuf = (Cmd_CompleteAliasCountPossible (partial) + 1) * sizeof (const char *);
+ const char **buf;
+
+ len = strlen(partial);
+ buf = Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *));
+ // Loop through the alias list and print all matches
+ for (alias = cmd_alias; alias; alias = alias->next)
+ if (!strncasecmp(partial, alias->name, len))
+ buf[bpos++] = alias->name;
+
+ buf[bpos] = NULL;
+ return buf;
+}
+
/*
============
Cmd_ExecuteString
FIXME: lookupnoadd the token to speed search?
============
*/
-void Cmd_ExecuteString (char *text, cmd_source_t src)
-{
- cmd_function_t *cmd;
- cmdalias_t *a;
+void Cmd_ExecuteString (const char *text, cmd_source_t src)
+{
+ int oldpos;
+ cmd_function_t *cmd;
+ cmdalias_t *a;
+ oldpos = cmd_tokenizebufferpos;
cmd_source = src;
Cmd_TokenizeString (text);
-
+
// execute the command line
if (!Cmd_Argc())
+ {
+ cmd_tokenizebufferpos = oldpos;
return; // no tokens
+ }
// check functions
for (cmd=cmd_functions ; cmd ; cmd=cmd->next)
{
- if (!Q_strcasecmp (cmd_argv[0],cmd->name))
+ if (!strcasecmp (cmd_argv[0],cmd->name))
{
cmd->function ();
+ cmd_tokenizebufferpos = oldpos;
return;
}
}
// check alias
for (a=cmd_alias ; a ; a=a->next)
{
- if (!Q_strcasecmp (cmd_argv[0], a->name))
+ if (!strcasecmp (cmd_argv[0], a->name))
{
- Cbuf_InsertText (a->value);
+ Cmd_ExecuteAlias(a);
+ cmd_tokenizebufferpos = oldpos;
return;
}
}
-
+
// check cvars
- if (!Cvar_Command ())
- Con_Printf ("Unknown command \"%s\"\n", Cmd_Argv(0));
-
+ if (!Cvar_Command () && host_framecount > 0)
+ Con_Printf("Unknown command \"%s\"\n", Cmd_Argv(0));
+
+ cmd_tokenizebufferpos = oldpos;
}
/*
===================
-Cmd_ForwardToServer
+Cmd_ForwardStringToServer
-Sends the entire command line over to the server
+Sends an entire command string over to the server, unprocessed
===================
*/
-void Cmd_ForwardToServer (void)
+void Cmd_ForwardStringToServer (const char *s)
{
if (cls.state != ca_connected)
{
- Con_Printf ("Can't \"%s\", not connected\n", Cmd_Argv(0));
+ Con_Printf("Can't \"%s\", not connected\n", s);
return;
}
-
+
if (cls.demoplayback)
return; // not really connected
- MSG_WriteByte (&cls.message, clc_stringcmd);
- if (Q_strcasecmp(Cmd_Argv(0), "cmd") != 0)
- {
- SZ_Print (&cls.message, Cmd_Argv(0));
- SZ_Print (&cls.message, " ");
- }
- if (Cmd_Argc() > 1)
- SZ_Print (&cls.message, Cmd_Args());
+ // LordHavoc: thanks to Fuh for bringing the pure evil of SZ_Print to my
+ // attention, it has been eradicated from here, its only (former) use in
+ // all of darkplaces.
+ MSG_WriteByte(&cls.message, clc_stringcmd);
+ SZ_Write(&cls.message, s, (int)strlen(s) + 1);
+}
+
+/*
+===================
+Cmd_ForwardToServer
+
+Sends the entire command line over to the server
+===================
+*/
+void Cmd_ForwardToServer (void)
+{
+ const char *s;
+ if (strcasecmp(Cmd_Argv(0), "cmd"))
+ s = va("%s %s", Cmd_Argv(0), Cmd_Argc() > 1 ? Cmd_Args() : "");
else
- SZ_Print (&cls.message, "\n");
+ s = Cmd_Argc() > 1 ? Cmd_Args() : "";
+ Cmd_ForwardStringToServer(s);
}
================
*/
-int Cmd_CheckParm (char *parm)
+int Cmd_CheckParm (const char *parm)
{
int i;
-
+
if (!parm)
- Sys_Error ("Cmd_CheckParm: NULL");
+ {
+ Con_Printf ("Cmd_CheckParm: NULL");
+ return 0;
+ }
for (i = 1; i < Cmd_Argc (); i++)
- if (!Q_strcasecmp (parm, Cmd_Argv (i)))
+ if (!strcasecmp (parm, Cmd_Argv (i)))
return i;
-
+
return 0;
}
+
projects / xonotic / darkplaces.git / blobdiff