X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cmd.c;h=a911fb346fd6de24a57f7af1912593cffa637ce3;hp=2626069c840ff27870a6b38f32dea714f3e13cc1;hb=06acd3f5d014dcb2d5d984d2ebe916eb5e3aa78b;hpb=ea3f4513f96a21ae1bcbaae4a4997968ace1ab95 diff --git a/cmd.c b/cmd.c index 2626069c..a911fb34 100644 --- a/cmd.c +++ b/cmd.c @@ -22,6 +22,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #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 +#define CMDBUFSIZE 32768 +// maximum number of parameters to a command +#define MAX_ARGS 80 +// maximum tokenizable commandline length (counting NUL terminations) +#define CMD_TOKENIZELENGTH (MAX_INPUTLINE + 80) typedef struct cmdalias_s { @@ -36,7 +43,6 @@ static qboolean cmd_wait; static mempool_t *cmd_mempool; -#define CMD_TOKENIZELENGTH 4096 static char cmd_tokenizebuffer[CMD_TOKENIZELENGTH]; static int cmd_tokenizebufferpos = 0; @@ -64,9 +70,8 @@ static void Cmd_Wait_f (void) ============================================================================= */ - // LordHavoc: inreased this from 8192 to 32768 static sizebuf_t cmd_text; -static unsigned char cmd_text_buf[32768]; +static unsigned char cmd_text_buf[CMDBUFSIZE]; /* ============ @@ -132,11 +137,13 @@ void Cbuf_InsertText (const char *text) Cbuf_Execute ============ */ +static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned maxoutlen, cmdalias_t *alias ); void Cbuf_Execute (void) { int i; char *text; - char line[1024]; + char line[MAX_INPUTLINE]; + char preprocessed[MAX_INPUTLINE]; int quotes; // LordHavoc: making sure the tokenizebuffer doesn't get filled up by repeated crashes @@ -175,7 +182,8 @@ void Cbuf_Execute (void) } // execute the command line - Cmd_ExecuteString (line, src_command); + Cmd_PreprocessString( line, preprocessed, sizeof(preprocessed), NULL ); + Cmd_ExecuteString (preprocessed, src_command); if (cmd_wait) { // skip out while text still remains in buffer, leaving it @@ -209,7 +217,7 @@ void Cmd_StuffCmds_f (void) { int i, j, l; // this is per command, and bounds checked (no buffer overflows) - char build[2048]; + char build[MAX_INPUTLINE]; if (Cmd_Argc () != 1) { @@ -273,6 +281,15 @@ static void Cmd_Exec_f (void) } Con_DPrintf("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 + // but Cbuf_InsertText inserts before, so this actually ends up after it. + if (!strcmp(Cmd_Argv(1), "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) + // (note: insertion order here is backwards from execution order, so this adds it after the text, by calling it before...) + Cbuf_InsertText ("\n"); Cbuf_InsertText (f); Mem_Free(f); } @@ -294,6 +311,86 @@ static void Cmd_Echo_f (void) Con_Print("\n"); } +// DRESK - 5/14/06 +// Support Doom3-style Toggle Console Command +/* +=============== +Cmd_Toggle_f + +Toggles a specified console variable amongst the values specified (default is 0 and 1) +=============== +*/ +static void Cmd_Toggle_f(void) +{ + // Acquire Number of Arguments + int nNumArgs = Cmd_Argc(); + + if(nNumArgs == 1) + // No Arguments Specified; Print Usage + Con_Print("Toggle Console Variable - Usage\n toggle - toggles between 0 and 1\n toggle - toggles between 0 and \n toggle [string 1] [string 2]...[string n] - cycles through all strings\n"); + else + { // Correct Arguments Specified + // Acquire Potential CVar + cvar_t* cvCVar = Cvar_FindVar( Cmd_Argv(1) ); + + if(cvCVar != NULL) + { // Valid CVar + if(nNumArgs == 2) + { // Default Usage + if(cvCVar->integer) + Cvar_SetValueQuick(cvCVar, 0); + else + Cvar_SetValueQuick(cvCVar, 1); + } + else + if(nNumArgs == 3) + { // 0 and Specified Usage + if(cvCVar->integer == atoi(Cmd_Argv(2) ) ) + // CVar is Specified Value; // Reset to 0 + Cvar_SetValueQuick(cvCVar, 0); + else + if(cvCVar->integer == 0) + // CVar is 0; Specify Value + Cvar_SetQuick(cvCVar, Cmd_Argv(2) ); + else + // CVar does not match; Reset to 0 + Cvar_SetValueQuick(cvCVar, 0); + } + else + { // Variable Values Specified + int nCnt; + int bFound = 0; + + for(nCnt = 2; nCnt < nNumArgs; nCnt++) + { // Cycle through Values + if( strcmp(cvCVar->string, Cmd_Argv(nCnt) ) == 0) + { // Current Value Located; Increment to Next + if( (nCnt + 1) == nNumArgs) + // Max Value Reached; Reset + Cvar_SetQuick(cvCVar, Cmd_Argv(2) ); + else + // Next Value + Cvar_SetQuick(cvCVar, Cmd_Argv(nCnt + 1) ); + + // End Loop + nCnt = nNumArgs; + // Assign Found + bFound = 1; + } + } + if(!bFound) + // Value not Found; Reset to Original + Cvar_SetQuick(cvCVar, Cmd_Argv(2) ); + } + + } + else + { // Invalid CVar + Con_Printf("ERROR : CVar '%s' not found\n", Cmd_Argv(2) ); + } + } +} + /* =============== Cmd_Alias_f @@ -304,9 +401,10 @@ Creates a new command that executes a command string (possibly ; seperated) static void Cmd_Alias_f (void) { cmdalias_t *a; - char cmd[1024]; + char cmd[MAX_INPUTLINE]; int i, c; const char *s; + size_t alloclen; if (Cmd_Argc() == 1) { @@ -362,8 +460,9 @@ static void Cmd_Alias_f (void) } strlcat (cmd, "\n", sizeof (cmd)); - a->value = (char *)Z_Malloc (strlen (cmd) + 1); - strcpy (a->value, cmd); + alloclen = strlen (cmd) + 1; + a->value = (char *)Z_Malloc (alloclen); + memcpy (a->value, cmd, alloclen); } /* @@ -378,102 +477,126 @@ typedef struct cmd_function_s { struct cmd_function_s *next; const char *name; + const char *description; xcommand_t function; + qboolean csqcfunc; } cmd_function_t; - -#define MAX_ARGS 80 - static int cmd_argc; static const char *cmd_argv[MAX_ARGS]; static const char *cmd_null_string = ""; -static const char *cmd_args = NULL; - +static const char *cmd_args; cmd_source_t cmd_source; static cmd_function_t *cmd_functions; // possible commands to execute /* -============ -Cmd_ExecuteAlias +Cmd_PreprocessString -Called for aliases and fills in the alias into the cbuffer -============ +Preprocesses strings and replaces $*, $param#, $cvar accordingly */ -static void Cmd_ExecuteAlias (cmdalias_t *alias) -{ -#define ALIAS_BUFFER 1024 - static char buffer[ ALIAS_BUFFER + 2 ]; +static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned maxoutlen, cmdalias_t *alias ) { const char *in; - char *out; unsigned outlen; int inquote; - in = alias->value; - out = buffer; + // don't crash if there's no room in the outtext buffer + if( maxoutlen == 0 ) { + return; + } + maxoutlen--; // because of \0 + + in = intext; outlen = 0; inquote = 0; - while( *in && outlen < ALIAS_BUFFER ) - { - if( *in == '"' ) - { - inquote ^= 1; - } - else if( *in == '$' && !inquote ) - { - // $* is replaced with all formal parameters, $num is parsed as an argument (or as $num if there arent enough parameters), $bla becomes $bla and $$bla becomes $$bla - // read over the $ + while( *in && outlen < maxoutlen ) { + if( *in == '$' && !inquote ) { + // this is some kind of expansion, see what comes after the $ in++; - if( *in == '*' ) - { + // replacements that can always be used: + // $$ is replaced with $, to allow escaping $ + // $ is replaced with the contents of the cvar + // + // the following can be used in aliases only: + // $* is replaced with all formal parameters (including name of the alias - this probably is not desirable) + // $0 is replaced with the name of this alias + // $ is replaced with an argument to this alias (or copied as-is if no such parameter exists), can be multiple digits + if( *in == '$' ) { + outtext[outlen++] = *in++; + } else if( *in == '*' && alias ) { const char *linein = Cmd_Args(); - // include all params + + // include all parameters if (linein) { - while( *linein && outlen < ALIAS_BUFFER ) { - *out++ = *linein++; - outlen++; + while( *linein && outlen < maxoutlen ) { + outtext[outlen++] = *linein++; } } in++; - } else { + } else if( '0' <= *in && *in <= '9' && alias ) { char *nexttoken; int argnum; argnum = strtol( in, &nexttoken, 10 ); - if( 0 < argnum && argnum < Cmd_Argc() ) - { + if( 0 <= argnum && argnum < Cmd_Argc() ) { const char *param = Cmd_Argv( argnum ); - while( *param && outlen < ALIAS_BUFFER ) { - *out++ = *param++; - outlen++; + while( *param && outlen < maxoutlen ) { + outtext[outlen++] = *param++; } in = nexttoken; - } - else if( argnum >= Cmd_Argc() ) - { + } 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 ); - *out++ = '$'; - outlen++; + outtext[outlen++] = '$'; } - // not a number - else if( argnum == 0 ) - { - *out++ = '$'; - outlen++; + } else { + cvar_t *cvar; + const char *tempin = in; + + COM_ParseTokenConsole( &tempin ); + // don't expand rcon_password or similar cvars (CVAR_PRIVATE flag) + if ((cvar = Cvar_FindVar(&com_token[0])) && !(cvar->flags & CVAR_PRIVATE)) { + const char *cvarcontent = cvar->string; + while( *cvarcontent && outlen < maxoutlen ) { + outtext[outlen++] = *cvarcontent++; + } + in = tempin; + } else { + if( alias ) { + Con_Printf( "Warning: could not find cvar %s when expanding alias %s\n %s\n", com_token, alias->name, alias->value ); + } else { + Con_Printf( "Warning: could not find cvar %s\n", com_token ); + } + outtext[outlen++] = '$'; } } } else { - *out++ = *in++; - outlen++; + if( *in == '"' ) { + inquote ^= 1; + } + outtext[outlen++] = *in++; } } - *out++ = '\n'; - *out++ = 0; - Cbuf_AddText( buffer ); + outtext[outlen] = 0; +} + +/* +============ +Cmd_ExecuteAlias + +Called for aliases and fills in the alias into the cbuffer +============ +*/ +static void Cmd_ExecuteAlias (cmdalias_t *alias) +{ + static char buffer[ MAX_INPUTLINE + 2 ]; + 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) + Cbuf_InsertText( buffer ); } /* @@ -507,15 +630,14 @@ static void Cmd_List_f (void) { if (partial && strncmp(partial, cmd->name, len)) continue; - Con_Printf("%s\n", cmd->name); + Con_Printf("%s : %s\n", cmd->name, cmd->description); count++; } - Con_Printf("%i Command%s", count, (count > 1) ? "s" : ""); if (partial) - Con_Printf(" beginning with \"%s\"", partial); - - Con_Print("\n\n"); + Con_Printf("%i Command%s beginning with \"%s\"\n\n", count, (count > 1) ? "s" : "", partial); + else + Con_Printf("%i Command%s\n\n", count, (count > 1) ? "s" : ""); } /* @@ -537,17 +659,28 @@ void Cmd_Init_Commands (void) // // register our commands // - Cmd_AddCommand ("stuffcmds",Cmd_StuffCmds_f); - Cmd_AddCommand ("exec",Cmd_Exec_f); - Cmd_AddCommand ("echo",Cmd_Echo_f); - 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_AddCommand ("stuffcmds",Cmd_StuffCmds_f, "execute commandline parameters (must be present in quake.rc script)"); + 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 $1 through $9, and $* for all parameters)"); + 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"); + + // 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 ("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"); + Cmd_AddCommand ("cvar_resettodefaults_all", Cvar_ResetToDefaults_All_f, "sets all cvars to their locked default values"); + 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)"); + + // 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)"); } /* @@ -600,6 +733,7 @@ Cmd_TokenizeString Parses the given string into command line tokens. ============ */ +// AK: This function should only be called from ExcuteString because the current design is a bit of an hack static void Cmd_TokenizeString (const char *text) { int l; @@ -619,7 +753,7 @@ static void Cmd_TokenizeString (const char *text) // Windows: \r\n if (*text == '\n' || *text == '\r') { - // a newline seperates commands in the buffer + // a newline separates commands in the buffer if (*text == '\r' && text[1] == '\n') text++; text++; @@ -630,34 +764,11 @@ static void Cmd_TokenizeString (const char *text) return; if (cmd_argc == 1) - cmd_args = text; + cmd_args = 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) { l = (int)strlen(com_token) + 1; @@ -666,7 +777,7 @@ static void Cmd_TokenizeString (const char *text) 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); + memcpy (cmd_tokenizebuffer + cmd_tokenizebufferpos, com_token, l); cmd_argv[cmd_argc] = cmd_tokenizebuffer + cmd_tokenizebufferpos; cmd_tokenizebufferpos += l; cmd_argc++; @@ -680,7 +791,7 @@ static void Cmd_TokenizeString (const char *text) Cmd_AddCommand ============ */ -void Cmd_AddCommand (const char *cmd_name, xcommand_t function) +void Cmd_AddCommand (const char *cmd_name, xcommand_t function, const char *description) { cmd_function_t *cmd; cmd_function_t *prev, *current; @@ -697,14 +808,25 @@ void Cmd_AddCommand (const char *cmd_name, xcommand_t function) { if (!strcmp (cmd_name, cmd->name)) { - Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name); - return; + if (function) + { + Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name); + return; + } + else //[515]: csqc + { + cmd->csqcfunc = true; + return; + } } } cmd = (cmd_function_t *)Mem_Alloc(cmd_mempool, sizeof(cmd_function_t)); cmd->name = cmd_name; cmd->function = function; + cmd->description = description; + if(!function) //[515]: csqc + cmd->csqcfunc = true; cmd->next = cmd_functions; // insert it at the right alphanumeric position @@ -752,7 +874,7 @@ const char *Cmd_CompleteCommand (const char *partial) // check functions for (cmd = cmd_functions; cmd; cmd = cmd->next) - if (!strncmp(partial, cmd->name, len)) + if (!strncasecmp(partial, cmd->name, len)) return cmd->name; return NULL; @@ -815,6 +937,17 @@ const char **Cmd_CompleteBuildList (const char *partial) return buf; } +// written by LordHavoc +void Cmd_CompleteCommandPrint (const char *partial) +{ + cmd_function_t *cmd; + size_t len = strlen(partial); + // Loop through the command list and print all matches + for (cmd = cmd_functions; cmd; cmd = cmd->next) + if (!strncasecmp(partial, cmd->name, len)) + Con_Printf("%s : %s\n", cmd->name, cmd->description); +} + /* Cmd_CompleteAlias @@ -842,6 +975,18 @@ const char *Cmd_CompleteAlias (const char *partial) return NULL; } +// written by LordHavoc +void Cmd_CompleteAliasPrint (const char *partial) +{ + cmdalias_t *alias; + size_t len = strlen(partial); + // Loop through the alias list and print all matches + for (alias = cmd_alias; alias; alias = alias->next) + if (!strncasecmp(partial, alias->name, len)) + Con_Printf("%s : %s\n", alias->name, alias->value); +} + + /* Cmd_CompleteAliasCountPossible @@ -900,6 +1045,14 @@ const char **Cmd_CompleteAliasBuildList (const char *partial) return buf; } +void Cmd_ClearCsqcFuncs (void) +{ + cmd_function_t *cmd; + for (cmd=cmd_functions ; cmd ; cmd=cmd->next) + cmd->csqcfunc = false; +} + +qboolean CL_VM_ConsoleCommand (const char *cmd); /* ============ Cmd_ExecuteString @@ -916,6 +1069,7 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src) oldpos = cmd_tokenizebufferpos; cmd_source = src; + Cmd_TokenizeString (text); // execute the command line @@ -930,7 +1084,14 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src) { if (!strcasecmp (cmd_argv[0],cmd->name)) { - cmd->function (); + if(cmd->function && !cmd->csqcfunc) + cmd->function (); + else + if(CL_VM_ConsoleCommand (text)) //[515]: csqc + return; + else + if(cmd->function) + cmd->function (); cmd_tokenizebufferpos = oldpos; return; } @@ -970,14 +1131,17 @@ void Cmd_ForwardStringToServer (const char *s) return; } - if (cls.demoplayback) - return; // not really connected + if (!cls.netcon) + return; // 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, (const unsigned char *)s, (int)strlen(s) + 1); + if (cls.protocol == PROTOCOL_QUAKEWORLD) + MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd); + else + MSG_WriteByte(&cls.netcon->message, clc_stringcmd); + SZ_Write(&cls.netcon->message, (const unsigned char *)s, (int)strlen(s) + 1); } /*