X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cmd.c;h=d46db8445ea513c1c1f1e5a121f16f69a1134a8e;hb=281412c28688a491cc4124f0c5ec783a409df820;hp=a8349082bc0b8344bcb87bf8783d9acb00f725a0;hpb=beba2f9a1752c871a39303e5d559e779fac69271;p=xonotic%2Fdarkplaces.git diff --git a/cmd.c b/cmd.c index a8349082..d46db844 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,8 +21,6 @@ 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 @@ -32,12 +30,11 @@ typedef struct cmdalias_s char *value; } cmdalias_t; -cmdalias_t *cmd_alias; +static cmdalias_t *cmd_alias; -int trashtest; -int *trashspot; +static qboolean cmd_wait; -qboolean cmd_wait; +static mempool_t *cmd_mempool; //============================================================================= @@ -50,7 +47,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 +60,7 @@ void Cmd_Wait_f (void) ============================================================================= */ -sizebuf_t cmd_text; +static sizebuf_t cmd_text; /* ============ @@ -72,7 +69,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 } @@ -86,7 +84,7 @@ Adds command text at the end of the buffer void Cbuf_AddText (char *text) { int l; - + l = strlen (text); if (cmd_text.cursize + l >= cmd_text.maxsize) @@ -123,10 +121,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) { @@ -146,7 +144,7 @@ void Cbuf_Execute (void) char *text; char line[1024]; int quotes; - + while (cmd_text.cursize) { // find a \n or ; line break @@ -162,11 +160,10 @@ void Cbuf_Execute (void) if (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 +179,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,7 +212,7 @@ 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"); @@ -232,7 +229,7 @@ void Cmd_StuffCmds_f (void) } if (!s) return; - + text = Z_Malloc (s+1); text[0] = 0; for (i=1 ; inext = cmd_alias; cmd_alias = a; } - strcpy (a->name, s); + strcpy (a->name, s); // copy the rest of the command line cmd[0] = 0; // start out with a null string @@ -386,7 +383,7 @@ void Cmd_Alias_f (void) strcat (cmd, " "); } strcat (cmd, "\n"); - + a->value = CopyString (cmd); } @@ -408,15 +405,15 @@ typedef struct cmd_function_s #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 char *cmd_argv[MAX_ARGS]; +static char *cmd_null_string = ""; +static 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,7 +424,7 @@ Cmd_List ======== */ -void Cmd_List_f (void) +static void Cmd_List_f (void) { cmd_function_t *cmd; char *partial; @@ -464,6 +461,8 @@ Cmd_Init */ void Cmd_Init (void) { + cmd_mempool = Mem_AllocPool("commands"); + // // register our commands // @@ -497,7 +496,7 @@ char *Cmd_Argv (int arg) { if (arg >= cmd_argc ) return cmd_null_string; - return cmd_argv[arg]; + return cmd_argv[arg]; } /* @@ -511,6 +510,9 @@ char *Cmd_Args (void) } +#define CMD_TOKENIZELENGTH 4096 +char cmd_tokenizebuffer[CMD_TOKENIZELENGTH]; + /* ============ Cmd_TokenizeString @@ -518,17 +520,15 @@ Cmd_TokenizeString Parses the given string into command line tokens. ============ */ -void Cmd_TokenizeString (char *text) +static void Cmd_TokenizeString (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); + cmd_argv[cmd_argc] = cmd_tokenizebuffer + pos; + pos += l; strcpy (cmd_argv[cmd_argc], com_token); cmd_argc++; } } - + } @@ -572,17 +576,14 @@ Cmd_AddCommand void Cmd_AddCommand (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"); - + // 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); return; } - + // fail if the command already exists for (cmd=cmd_functions ; cmd ; cmd=cmd->next) { @@ -593,7 +594,7 @@ void Cmd_AddCommand (char *cmd_name, xcommand_t function) } } - 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; @@ -610,16 +611,13 @@ qboolean Cmd_Exists (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 @@ -629,12 +627,12 @@ char *Cmd_CompleteCommand (char *partial) { 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 +650,18 @@ char *Cmd_CompleteCommand (char *partial) Thanks to taniwha */ -int -Cmd_CompleteCountPossible (char *partial) +int Cmd_CompleteCountPossible (char *partial) { cmd_function_t *cmd; int 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)) @@ -682,8 +679,7 @@ Cmd_CompleteCountPossible (char *partial) Thanks to taniwha */ -char ** -Cmd_CompleteBuildList (char *partial) +char **Cmd_CompleteBuildList (char *partial) { cmd_function_t *cmd; int len = 0; @@ -692,7 +688,7 @@ Cmd_CompleteBuildList (char *partial) char **buf; len = strlen(partial); - buf = malloc(sizeofbuf + sizeof (char *)); + buf = Mem_Alloc(tempmempool, sizeofbuf + sizeof (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,8 +707,7 @@ Cmd_CompleteBuildList (char *partial) Thanks to taniwha */ -char -*Cmd_CompleteAlias (char * partial) +char *Cmd_CompleteAlias (char * partial) { cmdalias_t *alias; int len; @@ -739,8 +734,7 @@ char Thanks to taniwha */ -int -Cmd_CompleteAliasCountPossible (char *partial) +int Cmd_CompleteAliasCountPossible (char *partial) { cmdalias_t *alias; int len; @@ -770,8 +764,7 @@ Cmd_CompleteAliasCountPossible (char *partial) Thanks to taniwha */ -char ** -Cmd_CompleteAliasBuildList (char *partial) +char **Cmd_CompleteAliasBuildList (char *partial) { cmdalias_t *alias; int len = 0; @@ -780,7 +773,7 @@ Cmd_CompleteAliasBuildList (char *partial) char **buf; len = strlen(partial); - buf = malloc(sizeofbuf + sizeof (char *)); + buf = Mem_Alloc(tempmempool, sizeofbuf + sizeof (char *)); // Loop through the alias list and print all matches for (alias = cmd_alias; alias; alias = alias->next) if (!strncasecmp(partial, alias->name, len)) @@ -799,13 +792,13 @@ FIXME: lookupnoadd the token to speed search? ============ */ void Cmd_ExecuteString (char *text, cmd_source_t src) -{ +{ cmd_function_t *cmd; cmdalias_t *a; cmd_source = src; Cmd_TokenizeString (text); - + // execute the command line if (!Cmd_Argc()) return; // no tokens @@ -829,11 +822,10 @@ void Cmd_ExecuteString (char *text, cmd_source_t src) return; } } - + // check cvars if (!Cvar_Command ()) Con_Printf ("Unknown command \"%s\"\n", Cmd_Argv(0)); - } @@ -851,7 +843,7 @@ void Cmd_ForwardToServer (void) Con_Printf ("Can't \"%s\", not connected\n", Cmd_Argv(0)); return; } - + if (cls.demoplayback) return; // not really connected @@ -880,14 +872,14 @@ where the given parameter apears, or 0 if not present int Cmd_CheckParm (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))) return i; - + return 0; }