X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=inline;f=cmd.c;h=5d6121d151fd968054fc66d07f163d41a1347d26;hb=ff46d6ff516fda192c5adc55a5c9b82007545bd2;hp=a8349082bc0b8344bcb87bf8783d9acb00f725a0;hpb=beba2f9a1752c871a39303e5d559e779fac69271;p=xonotic%2Fdarkplaces.git diff --git a/cmd.c b/cmd.c index a8349082..5d6121d1 100644 --- a/cmd.c +++ b/cmd.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. 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. @@ -21,23 +21,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #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; //============================================================================= @@ -50,7 +51,7 @@ next frame. This allows commands like: bind g "impulse 5 ; +attack ; wait ; -attack ; impulse 2" ============ */ -void Cmd_Wait_f (void) +static void Cmd_Wait_f (void) { cmd_wait = true; } @@ -63,7 +64,7 @@ void Cmd_Wait_f (void) ============================================================================= */ -sizebuf_t cmd_text; +static sizebuf_t cmd_text; /* ============ @@ -72,7 +73,8 @@ Cbuf_Init */ void Cbuf_Init (void) { - SZ_Alloc (&cmd_text, 8192); // space for commands and script files + // LordHavoc: inreased this from 8192 to 32768 + SZ_Alloc (&cmd_text, 32768, "command buffer"); // space for commands and script files } @@ -83,15 +85,15 @@ Cbuf_AddText 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); if (cmd_text.cursize + l >= cmd_text.maxsize) { - Con_Printf ("Cbuf_AddText: overflow\n"); + Con_Print("Cbuf_AddText: overflow\n"); return; } @@ -108,7 +110,7 @@ Adds a \n to the 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; @@ -123,10 +125,10 @@ void Cbuf_InsertText (char *text) } else temp = NULL; // shut up compiler - + // add the entire text of the file Cbuf_AddText (text); - + // add the copied off data if (templen) { @@ -142,31 +144,35 @@ Cbuf_Execute */ 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 text = (char *)cmd_text.data; quotes = 0; + while (*text && *text <= ' ') + text++; for (i=0 ; i< cmd_text.cursize ; i++) { if (text[i] == '"') 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 @@ -182,7 +188,7 @@ void Cbuf_Execute (void) // 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 @@ -215,10 +221,10 @@ void Cmd_StuffCmds_f (void) int i, j; int s; char *text, *build, c; - + if (Cmd_Argc () != 1) { - Con_Printf ("stuffcmds : execute command line parameters\n"); + Con_Print("stuffcmds : execute command line parameters\n"); return; } @@ -232,7 +238,7 @@ void Cmd_StuffCmds_f (void) } if (!s) return; - + text = Z_Malloc (s+1); text[0] = 0; for (i=1 ; i : execute a script file\n"); + Con_Print("exec : execute a script file\n"); return; } - f = (char *)COM_LoadMallocFile (Cmd_Argv(1), false); + f = (char *)FS_LoadFile (Cmd_Argv(1), 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); - qfree(f); + Mem_Free(f); } @@ -310,13 +316,13 @@ Cmd_Echo_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 ; inext) - 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; } @@ -374,19 +379,19 @@ void Cmd_Alias_f (void) a->next = cmd_alias; cmd_alias = a; } - strcpy (a->name, s); + strlcpy (a->name, s, sizeof (a->name)); // 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"); - + strlcat (cmd, "\n", sizeof (cmd)); + a->value = CopyString (cmd); } @@ -400,23 +405,23 @@ void Cmd_Alias_f (void) 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 /* ======== @@ -427,34 +432,37 @@ Cmd_List ======== */ -void Cmd_List_f (void) +static void Cmd_List_f (void) { - cmd_function_t *cmd; - char *partial; - int len; - int count; + cmd_function_t *cmd; + const char *partial; + int len, count; - if (Cmd_Argc() > 1) { + if (Cmd_Argc() > 1) + { partial = Cmd_Argv (1); len = strlen(partial); - } else { + } + else + { partial = NULL; len = 0; } count = 0; - for (cmd = cmd_functions; cmd; cmd = cmd->next) { + for (cmd = cmd_functions; cmd; cmd = cmd->next) + { if (partial && strncmp(partial, cmd->name, len)) continue; - Con_Printf ("%s\n", cmd->name); + Con_Printf("%s\n", cmd->name); count++; } - Con_Printf ("%i Command%s", count, (count > 1) ? "s" : ""); + Con_Printf("%i Command%s", count, (count > 1) ? "s" : ""); if (partial) Con_Printf(" beginning with \"%s\"", partial); - Con_Printf ("\n\n"); + Con_Print("\n\n"); } /* @@ -464,6 +472,8 @@ Cmd_Init */ void Cmd_Init (void) { + cmd_mempool = Mem_AllocPool("commands"); + // // register our commands // @@ -493,11 +503,11 @@ int Cmd_Argc (void) 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]; } /* @@ -505,7 +515,7 @@ char *Cmd_Argv (int arg) Cmd_Args ============ */ -char *Cmd_Args (void) +const char *Cmd_Args (void) { return cmd_args; } @@ -518,49 +528,47 @@ Cmd_TokenizeString 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_TOKENIZELENGTH) + Sys_Error("Cmd_TokenizeString: ran out of %i character buffer space for command arguements\n", CMD_TOKENIZELENGTH); + strcpy (cmd_tokenizebuffer + cmd_tokenizebufferpos, com_token); + cmd_argv[cmd_argc] = cmd_tokenizebuffer + cmd_tokenizebufferpos; + cmd_tokenizebufferpos += l; cmd_argc++; } } - + } @@ -569,31 +577,28 @@ void Cmd_TokenizeString (char *text) 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; + // 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_AllocName (sizeof(cmd_function_t), "commands"); + cmd = Mem_Alloc(cmd_mempool, sizeof(cmd_function_t)); cmd->name = cmd_name; cmd->function = function; cmd->next = cmd_functions; @@ -605,36 +610,33 @@ void Cmd_AddCommand (char *cmd_name, xcommand_t function) 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; + int len; + len = strlen(partial); - + if (!len) return NULL; - + // check functions for (cmd = cmd_functions; cmd; cmd = cmd->next) if (!strncmp(partial, cmd->name, len)) @@ -652,19 +654,17 @@ char *Cmd_CompleteCommand (char *partial) Thanks to taniwha */ -int -Cmd_CompleteCountPossible (char *partial) +int Cmd_CompleteCountPossible (const char *partial) { - cmd_function_t *cmd; - int len; - int h; - + cmd_function_t *cmd; + int len, 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)) @@ -682,17 +682,16 @@ Cmd_CompleteCountPossible (char *partial) Thanks to taniwha */ -char ** -Cmd_CompleteBuildList (char *partial) +const char **Cmd_CompleteBuildList (const char *partial) { - cmd_function_t *cmd; - int len = 0; - int bpos = 0; - int sizeofbuf = (Cmd_CompleteCountPossible (partial) + 1) * sizeof (char *); - char **buf; + cmd_function_t *cmd; + int len = 0; + int bpos = 0; + int sizeofbuf = (Cmd_CompleteCountPossible (partial) + 1) * sizeof (const char *); + const char **buf; len = strlen(partial); - buf = malloc(sizeofbuf + sizeof (char *)); + 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)) @@ -711,11 +710,10 @@ Cmd_CompleteBuildList (char *partial) Thanks to taniwha */ -char -*Cmd_CompleteAlias (char * partial) +const char *Cmd_CompleteAlias (const char *partial) { - cmdalias_t *alias; - int len; + cmdalias_t *alias; + int len; len = strlen(partial); @@ -739,8 +737,7 @@ char Thanks to taniwha */ -int -Cmd_CompleteAliasCountPossible (char *partial) +int Cmd_CompleteAliasCountPossible (const char *partial) { cmdalias_t *alias; int len; @@ -770,17 +767,16 @@ Cmd_CompleteAliasCountPossible (char *partial) Thanks to taniwha */ -char ** -Cmd_CompleteAliasBuildList (char *partial) +const char **Cmd_CompleteAliasBuildList (const char *partial) { - cmdalias_t *alias; - int len = 0; - int bpos = 0; - int sizeofbuf = (Cmd_CompleteAliasCountPossible (partial) + 1) * sizeof (char *); - char **buf; + cmdalias_t *alias; + int len = 0; + int bpos = 0; + int sizeofbuf = (Cmd_CompleteAliasCountPossible (partial) + 1) * sizeof (const char *); + const char **buf; len = strlen(partial); - buf = malloc(sizeofbuf + sizeof (char *)); + 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)) @@ -798,42 +794,56 @@ A complete command line has been parsed, so try to execute it 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) +// check functions (only after host_initialized) + if (host_initialized || !strcasecmp(cmd_argv[0], "exec")) { - if (!Q_strcasecmp (cmd_argv[0],cmd->name)) + for (cmd=cmd_functions ; cmd ; cmd=cmd->next) { - cmd->function (); - return; + if (!strcasecmp (cmd_argv[0],cmd->name)) + { + cmd->function (); + cmd_tokenizebufferpos = oldpos; + return; + } } } -// check alias - for (a=cmd_alias ; a ; a=a->next) +// check alias (only after host_initialized) + if (host_initialized) { - if (!Q_strcasecmp (cmd_argv[0], a->name)) + for (a=cmd_alias ; a ; a=a->next) { - Cbuf_InsertText (a->value); - return; + if (!strcasecmp (cmd_argv[0], a->name)) + { + Cbuf_InsertText (a->value); + cmd_tokenizebufferpos = oldpos; + return; + } } } - -// check cvars - if (!Cvar_Command ()) - Con_Printf ("Unknown command \"%s\"\n", Cmd_Argv(0)); - + +// check cvars (always) + if (!Cvar_Command () && host_initialized) + Con_Printf("Unknown command \"%s\"\n", Cmd_Argv(0)); + + cmd_tokenizebufferpos = oldpos; } @@ -846,25 +856,25 @@ Sends the entire command line over to the server */ void Cmd_ForwardToServer (void) { + 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", Cmd_Argv(0)); 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. + if (strcasecmp(Cmd_Argv(0), "cmd") != 0) + s = va("%s %s", Cmd_Argv(0), Cmd_Argc() > 1 ? Cmd_Args() : "\n"); else - SZ_Print (&cls.message, "\n"); + s = Cmd_Argc() > 1 ? Cmd_Args() : "\n"; + MSG_WriteByte(&cls.message, clc_stringcmd); + SZ_Write(&cls.message, s, strlen(s) + 1); } @@ -877,17 +887,17 @@ where the given parameter apears, or 0 if not present ================ */ -int Cmd_CheckParm (char *parm) +int Cmd_CheckParm (const char *parm) { int i; - + if (!parm) Sys_Error ("Cmd_CheckParm: NULL"); for (i = 1; i < Cmd_Argc (); i++) - if (!Q_strcasecmp (parm, Cmd_Argv (i))) + if (!strcasecmp (parm, Cmd_Argv (i))) return i; - + return 0; }