X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cmd.c;h=7a4c5c17ee7a4ef94510b5bb93e04816876b0c7e;hb=7ef262a7368c32d0e0bf7eb8bf4bbf7c79338bff;hp=9a8a56da40776296ba4a3333e31774917bf0d9b2;hpb=7403ba135fe27515470bfc6a7f8980869ccfee76;p=xonotic%2Fdarkplaces.git diff --git a/cmd.c b/cmd.c index 9a8a56da..7a4c5c17 100644 --- a/cmd.c +++ b/cmd.c @@ -216,7 +216,7 @@ qboolean host_stuffcmdsrun = false; void Cmd_StuffCmds_f (void) { int i, j, l; - // this is per command, and bounds checked (no buffer overflows) + // this is for all commandline options combined (and is bounds checked) char build[MAX_INPUTLINE]; if (Cmd_Argc () != 1) @@ -225,12 +225,17 @@ void Cmd_StuffCmds_f (void) return; } + // no reason to run the commandline arguments twice + if (host_stuffcmdsrun) + return; + host_stuffcmdsrun = true; + build[0] = 0; + l = 0; for (i = 0;i < com_argc;i++) { - if (com_argv[i] && com_argv[i][0] == '+' && (com_argv[i][1] < '0' || com_argv[i][1] > '9')) + if (com_argv[i] && com_argv[i][0] == '+' && (com_argv[i][1] < '0' || com_argv[i][1] > '9') && l + strlen(com_argv[i]) - 1 <= sizeof(build) - 1) { - l = 0; j = 1; while (com_argv[i][j]) build[l++] = com_argv[i][j++]; @@ -241,20 +246,24 @@ void Cmd_StuffCmds_f (void) 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)) + if (l + strlen(com_argv[i]) + 4 > sizeof(build) - 1) break; build[l++] = ' '; - build[l++] = '\"'; + if (strchr(com_argv[i], ' ')) + build[l++] = '\"'; for (j = 0;com_argv[i][j];j++) build[l++] = com_argv[i][j]; - build[l++] = '\"'; + if (strchr(com_argv[i], ' ')) + build[l++] = '\"'; } build[l++] = '\n'; - build[l++] = 0; - Cbuf_InsertText (build); i--; } } + // now terminate the combined string and prepend it to the command buffer + // we already reserved space for the terminator + build[l++] = 0; + Cbuf_InsertText (build); } @@ -281,6 +290,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); } @@ -302,6 +320,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 @@ -315,6 +413,7 @@ static void Cmd_Alias_f (void) char cmd[MAX_INPUTLINE]; int i, c; const char *s; + size_t alloclen; if (Cmd_Argc() == 1) { @@ -370,8 +469,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); } /* @@ -386,7 +486,10 @@ typedef struct cmd_function_s { struct cmd_function_s *next; const char *name; - xcommand_t function; + const char *description; + xcommand_t consolefunction; + xcommand_t clientfunction; + qboolean csqcfunc; } cmd_function_t; static int cmd_argc; @@ -434,7 +537,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++; @@ -463,14 +567,19 @@ static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned ma const char *tempin = in; COM_ParseTokenConsole( &tempin ); - if ((cvar = Cvar_FindVar(&com_token[0]))) { + // 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 { - 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++] = '$'; } } @@ -495,7 +604,9 @@ static void Cmd_ExecuteAlias (cmdalias_t *alias) { static char buffer[ MAX_INPUTLINE + 2 ]; Cmd_PreprocessString( alias->value, buffer, sizeof(buffer) - 2, alias ); - Cbuf_AddText( buffer ); + // insert at start of command buffer, so that aliases execute in order + // (fixes bug introduced by Black on 20050705) + Cbuf_InsertText( buffer ); } /* @@ -529,7 +640,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 +669,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)"); } /* @@ -665,7 +787,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++; @@ -679,7 +801,7 @@ static void Cmd_TokenizeString (const char *text) Cmd_AddCommand ============ */ -void Cmd_AddCommand (const char *cmd_name, xcommand_t function) +void Cmd_AddCommand_WithClientCommand (const char *cmd_name, xcommand_t consolefunction, xcommand_t clientfunction, const char *description) { cmd_function_t *cmd; cmd_function_t *prev, *current; @@ -696,14 +818,26 @@ 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 (consolefunction || clientfunction) + { + 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->consolefunction = consolefunction; + cmd->clientfunction = clientfunction; + cmd->description = description; + if(!consolefunction && !clientfunction) //[515]: csqc + cmd->csqcfunc = true; cmd->next = cmd_functions; // insert it at the right alphanumeric position @@ -717,6 +851,11 @@ void Cmd_AddCommand (const char *cmd_name, xcommand_t function) cmd->next = current; } +void Cmd_AddCommand (const char *cmd_name, xcommand_t function, const char *description) +{ + Cmd_AddCommand_WithClientCommand (cmd_name, function, NULL, description); +} + /* ============ Cmd_Exists @@ -751,7 +890,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 +953,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 +991,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 +1061,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,12 +1100,47 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src) { if (!strcasecmp (cmd_argv[0],cmd->name)) { - cmd->function (); - cmd_tokenizebufferpos = oldpos; - return; + if (cmd->csqcfunc && CL_VM_ConsoleCommand (text)) //[515]: csqc + return; + switch (src) + { + case src_command: + if (cmd->consolefunction) + cmd->consolefunction (); + else if (cmd->clientfunction) + { + if (cls.state == ca_connected) + { + // forward remote commands to the server for execution + Cmd_ForwardToServer(); + } + else + Con_Printf("Can not send command \"%s\", not connected.\n", Cmd_Argv(0)); + } + else + Con_Printf("Command \"%s\" can not be executed\n", Cmd_Argv(0)); + cmd_tokenizebufferpos = oldpos; + return; + case src_client: + if (cmd->clientfunction) + { + cmd->clientfunction (); + cmd_tokenizebufferpos = oldpos; + return; + } + break; + } + break; } } + // if it's a client command and no command was found, say so. + if (cmd_source == src_client) + { + Con_Printf("player \"%s\" tried to %s\n", host_client->name, text); + return; + } + // check alias for (a=cmd_alias ; a ; a=a->next) { @@ -970,14 +1175,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); } /*