X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cmd.c;h=b042cd28b3de7cccffaacb127bb2ad099d1f7db3;hb=780934a7d98fc6f0a6d65ac8577bfc24dba3eebd;hp=47892f9afb2e9e07a17e049a2a9b8b6a484a7256;hpb=41ccada3109db212cbcbf4de635e31f30076fb27;p=xonotic%2Fdarkplaces.git diff --git a/cmd.c b/cmd.c index 47892f9a..b042cd28 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]; /* ============ @@ -135,11 +140,10 @@ Cbuf_Execute static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned maxoutlen, cmdalias_t *alias ); void Cbuf_Execute (void) { -#define EXECUTESTRING_BUFFER 2048 int i; char *text; - char line[1024]; - char preprocessed[EXECUTESTRING_BUFFER]; + char line[MAX_INPUTLINE]; + char preprocessed[MAX_INPUTLINE]; int quotes; // LordHavoc: making sure the tokenizebuffer doesn't get filled up by repeated crashes @@ -178,7 +182,7 @@ void Cbuf_Execute (void) } // execute the command line - Cmd_PreprocessString( line, preprocessed, EXECUTESTRING_BUFFER, NULL ); + Cmd_PreprocessString( line, preprocessed, sizeof(preprocessed), NULL ); Cmd_ExecuteString (preprocessed, src_command); if (cmd_wait) @@ -213,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) { @@ -308,7 +312,7 @@ 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; @@ -382,12 +386,11 @@ 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 = ""; @@ -433,7 +436,8 @@ static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned ma outtext[outlen++] = *in++; } else if( *in == '*' && alias ) { const char *linein = Cmd_Args(); - // include all params + + // include all parameters if (linein) { while( *linein && outlen < maxoutlen ) { outtext[outlen++] = *linein++; @@ -469,7 +473,11 @@ static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned ma } in = tempin; } else { - Con_Printf( "Warning: could not find cvar %s when expanding alias %s\n %s\n", com_token, alias->name, alias->value ); + 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++] = '$'; } } @@ -492,10 +500,11 @@ Called for aliases and fills in the alias into the cbuffer */ static void Cmd_ExecuteAlias (cmdalias_t *alias) { -#define ALIAS_BUFFER 1024 - static char buffer[ ALIAS_BUFFER + 2 ]; - Cmd_PreprocessString( alias->value, buffer, ALIAS_BUFFER, alias ); - Cbuf_AddText( buffer ); + 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 ); } /* @@ -529,7 +538,7 @@ 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++; } @@ -558,17 +567,19 @@ 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"); } /* @@ -679,7 +690,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; @@ -696,14 +707,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 @@ -751,7 +773,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; @@ -814,6 +836,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 @@ -841,6 +874,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 @@ -899,6 +944,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 @@ -930,7 +983,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 +1030,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); } /*