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)
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++];
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);
}
}
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);
}
{ // Correct Arguments Specified
// Acquire Potential CVar
cvar_t* cvCVar = Cvar_FindVar( Cmd_Argv(1) );
-
+
if(cvCVar != NULL)
{ // Valid CVar
if(nNumArgs == 2)
char cmd[MAX_INPUTLINE];
int i, c;
const char *s;
+ size_t alloclen;
if (Cmd_Argc() == 1)
{
}
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);
}
/*
struct cmd_function_s *next;
const char *name;
const char *description;
- xcommand_t function;
+ xcommand_t consolefunction;
+ xcommand_t clientfunction;
qboolean csqcfunc;
} cmd_function_t;
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++;
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)");
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++;
Cmd_AddCommand
============
*/
-void Cmd_AddCommand (const char *cmd_name, xcommand_t function, const char *description)
+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;
{
if (!strcmp (cmd_name, cmd->name))
{
- if (function)
+ if (consolefunction || clientfunction)
{
Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name);
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(!function) //[515]: csqc
+ if(!consolefunction && !clientfunction) //[515]: csqc
cmd->csqcfunc = true;
cmd->next = cmd_functions;
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
{
if (!strcasecmp (cmd_argv[0],cmd->name))
{
- if(cmd->function && !cmd->csqcfunc)
- cmd->function ();
- else
- if(CL_VM_ConsoleCommand (text)) //[515]: csqc
- 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
- if(cmd->function)
- cmd->function ();
- cmd_tokenizebufferpos = oldpos;
- return;
+ 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)
{
projects / xonotic / darkplaces.git / blobdiff