X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cmd.c;h=ce200ea2de3ad16414b041fe1a4b5978fcf3493b;hb=c2dbdcd8e1b22d1cda951f2fdae9961f7cb1ba53;hp=c8aa380399379b67734276ecefbd35e44bb8bc70;hpb=43ee5e136a693ac9cfb40cb03fceea7d3149104f;p=xonotic%2Fdarkplaces.git diff --git a/cmd.c b/cmd.c index c8aa3803..ce200ea2 100644 --- a/cmd.c +++ b/cmd.c @@ -36,6 +36,10 @@ static qboolean cmd_wait; static mempool_t *cmd_mempool; +#define CMD_TOKENIZELENGTH 4096 +static char cmd_tokenizebuffer[CMD_TOKENIZELENGTH]; +static int cmd_tokenizebufferpos = 0; + //============================================================================= /* @@ -73,6 +77,15 @@ void Cbuf_Init (void) SZ_Alloc (&cmd_text, 32768, "command buffer"); // space for commands and script files } +/* +============ +Cbuf_Shutdown +============ +*/ +void Cbuf_Shutdown (void) +{ + SZ_Free (&cmd_text); +} /* ============ @@ -89,7 +102,7 @@ void Cbuf_AddText (const char *text) if (cmd_text.cursize + l >= cmd_text.maxsize) { - Con_Printf ("Cbuf_AddText: overflow\n"); + Con_Print("Cbuf_AddText: overflow\n"); return; } @@ -111,25 +124,25 @@ void Cbuf_InsertText (const char *text) char *temp; int templen; -// copy off any commands still remaining in the exec buffer + // copy off any commands still remaining in the exec buffer templen = cmd_text.cursize; if (templen) { - temp = Z_Malloc (templen); + temp = Mem_Alloc (tempmempool, templen); memcpy (temp, cmd_text.data, templen); SZ_Clear (&cmd_text); } else - temp = NULL; // shut up compiler + temp = NULL; -// add the entire text of the file + // add the entire text of the file Cbuf_AddText (text); -// add the copied off data - if (templen) + // add the copied off data + if (temp != NULL) { SZ_Write (&cmd_text, temp, templen); - Z_Free (temp); + Mem_Free (temp); } } @@ -145,6 +158,9 @@ void Cbuf_Execute (void) char line[1024]; int quotes; + // LordHavoc: making sure the tokenizebuffer doesn't get filled up by repeated crashes + cmd_tokenizebufferpos = 0; + while (cmd_text.cursize) { // find a \n or ; line break @@ -157,7 +173,7 @@ void Cbuf_Execute (void) quotes++; if ( !(quotes&1) && text[i] == ';') break; // don't break if inside a quoted string - if (text[i] == '\n') + if (text[i] == '\r' || text[i] == '\n') break; } @@ -174,7 +190,7 @@ void Cbuf_Execute (void) { i++; cmd_text.cursize -= i; - memcpy (text, text+i, cmd_text.cursize); + memcpy (cmd_text.data, text+i, cmd_text.cursize); } // execute the command line @@ -209,66 +225,45 @@ quake -nosound +cmd amlev1 */ void Cmd_StuffCmds_f (void) { - int i, j; - int s; - char *text, *build, c; + int i, j, l; + // this is per command, and bounds checked (no buffer overflows) + char build[2048]; if (Cmd_Argc () != 1) { - Con_Printf ("stuffcmds : execute command line parameters\n"); - return; - } - -// build the combined string to parse from - s = 0; - for (i=1 ; i '9')) { + l = 0; + j = 1; + while (com_argv[i][j]) + build[l++] = com_argv[i][j++]; i++; - - for (j=i ; (text[j] != '+') && (text[j] != '-') && (text[j] != 0) ; j++) - ; - - c = text[j]; - text[j] = 0; - - strcat (build, text+i); - strcat (build, "\n"); - text[j] = c; - i = j-1; + for (;i < com_argc;i++) + { + if (!com_argv[i]) + 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)) + break; + build[l++] = ' '; + build[l++] = '\"'; + for (j = 0;com_argv[i][j];j++) + build[l++] = com_argv[i][j]; + build[l++] = '\"'; + } + build[l++] = '\n'; + build[l++] = 0; + Cbuf_InsertText (build); + i--; } } - - if (build[0]) - Cbuf_InsertText (build); - - Z_Free (text); - Z_Free (build); } @@ -283,17 +278,17 @@ static void Cmd_Exec_f (void) if (Cmd_Argc () != 2) { - Con_Printf ("exec : execute a script file\n"); + Con_Print("exec : execute a script file\n"); return; } - f = (char *)COM_LoadFile (Cmd_Argv(1), false); + f = (char *)FS_LoadFile (Cmd_Argv(1), tempmempool, false); if (!f) { - Con_Printf ("couldn't exec %s\n",Cmd_Argv(1)); + Con_Printf("couldn't exec %s\n",Cmd_Argv(1)); return; } - Con_Printf ("execing %s\n",Cmd_Argv(1)); + Con_DPrintf("execing %s\n",Cmd_Argv(1)); Cbuf_InsertText (f); Mem_Free(f); @@ -312,8 +307,8 @@ static void Cmd_Echo_f (void) int i; for (i=1 ; inext) - Con_Printf ("%s : %s\n", a->name, a->value); + Con_Printf("%s : %s\n", a->name, a->value); return; } s = Cmd_Argv(1); if (strlen(s) >= MAX_ALIAS_NAME) { - Con_Printf ("Alias name is too long\n"); + Con_Print("Alias name is too long\n"); return; } @@ -370,20 +356,21 @@ static void Cmd_Alias_f (void) a->next = cmd_alias; cmd_alias = a; } - strcpy (a->name, s); + strlcpy (a->name, s, sizeof (a->name)); // copy the rest of the command line cmd[0] = 0; // start out with a null string c = Cmd_Argc(); for (i=2 ; i< c ; i++) { - strcat (cmd, Cmd_Argv(i)); + strlcat (cmd, Cmd_Argv(i), sizeof (cmd)); if (i != c) - strcat (cmd, " "); + strlcat (cmd, " ", sizeof (cmd)); } - strcat (cmd, "\n"); + strlcat (cmd, "\n", sizeof (cmd)); - a->value = CopyString (cmd); + a->value = Z_Malloc (strlen (cmd) + 1); + strcpy (a->value, cmd); } /* @@ -445,15 +432,15 @@ static void Cmd_List_f (void) { if (partial && strncmp(partial, cmd->name, len)) continue; - Con_Printf ("%s\n", cmd->name); + Con_Printf("%s\n", cmd->name); count++; } - Con_Printf ("%i Command%s", count, (count > 1) ? "s" : ""); + Con_Printf("%i Command%s", count, (count > 1) ? "s" : ""); if (partial) Con_Printf(" beginning with \"%s\"", partial); - Con_Printf ("\n\n"); + Con_Print("\n\n"); } /* @@ -463,7 +450,7 @@ Cmd_Init */ void Cmd_Init (void) { - cmd_mempool = Mem_AllocPool("commands"); + cmd_mempool = Mem_AllocPool("commands", 0, NULL); // // register our commands @@ -477,6 +464,18 @@ void Cmd_Init (void) 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_Shutdown +============ +*/ +void Cmd_Shutdown(void) +{ + Mem_FreePool(&cmd_mempool); } /* @@ -512,9 +511,6 @@ const char *Cmd_Args (void) } -#define CMD_TOKENIZELENGTH 4096 -char cmd_tokenizebuffer[CMD_TOKENIZELENGTH]; - /* ============ Cmd_TokenizeString @@ -525,22 +521,25 @@ Parses the given string into command line tokens. static void Cmd_TokenizeString (const char *text) { int l; - int pos; - pos = 0; cmd_argc = 0; cmd_args = NULL; while (1) { -// skip whitespace up to a /n - while (*text && *text <= ' ' && *text != '\n') - { + // skip whitespace up to a /n + while (*text && *text <= ' ' && *text != '\r' && *text != '\n') text++; - } - if (*text == '\n') - { // a newline seperates commands in the buffer + // line endings: + // UNIX: \n + // Mac: \r + // Windows: \r\n + if (*text == '\n' || *text == '\r') + { + // a newline seperates commands in the buffer + if (*text == '\r' && text[1] == '\n') + text++; text++; break; } @@ -551,17 +550,17 @@ static void Cmd_TokenizeString (const char *text) if (cmd_argc == 1) cmd_args = text; - if (!COM_ParseToken (&text)) + if (!COM_ParseTokenConsole(&text)) return; if (cmd_argc < MAX_ARGS) { l = strlen(com_token) + 1; - if (pos + l > CMD_TOKENIZELENGTH) + if (cmd_tokenizebufferpos + l > CMD_TOKENIZELENGTH) Sys_Error("Cmd_TokenizeString: ran out of %i character buffer space for command arguements\n", CMD_TOKENIZELENGTH); - strcpy (cmd_tokenizebuffer + pos, com_token); - cmd_argv[cmd_argc] = cmd_tokenizebuffer + pos; - pos += l; + strcpy (cmd_tokenizebuffer + cmd_tokenizebufferpos, com_token); + cmd_argv[cmd_argc] = cmd_tokenizebuffer + cmd_tokenizebufferpos; + cmd_tokenizebufferpos += l; cmd_argc++; } } @@ -581,7 +580,7 @@ void Cmd_AddCommand (const char *cmd_name, xcommand_t function) // 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); + Con_Printf("Cmd_AddCommand: %s already defined as a var\n", cmd_name); return; } @@ -590,7 +589,7 @@ 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); + Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name); return; } } @@ -793,70 +792,97 @@ FIXME: lookupnoadd the token to speed search? */ void Cmd_ExecuteString (const char *text, cmd_source_t src) { + int oldpos; cmd_function_t *cmd; cmdalias_t *a; + oldpos = cmd_tokenizebufferpos; cmd_source = src; Cmd_TokenizeString (text); // execute the command line if (!Cmd_Argc()) + { + cmd_tokenizebufferpos = oldpos; return; // no tokens + } -// check functions - for (cmd=cmd_functions ; cmd ; cmd=cmd->next) +// check functions (only after host_initialized) + if (host_initialized || !strcasecmp(cmd_argv[0], "exec") || !strcasecmp(cmd_argv[0], "set") || !strcasecmp(cmd_argv[0], "seta")) { - if (!Q_strcasecmp (cmd_argv[0],cmd->name)) + for (cmd=cmd_functions ; cmd ; cmd=cmd->next) { - cmd->function (); - return; + if (!strcasecmp (cmd_argv[0],cmd->name)) + { + cmd->function (); + cmd_tokenizebufferpos = oldpos; + return; + } } } -// check alias - for (a=cmd_alias ; a ; a=a->next) +// check alias (only after host_initialized) + if (host_initialized) { - if (!Q_strcasecmp (cmd_argv[0], a->name)) + for (a=cmd_alias ; a ; a=a->next) { - Cbuf_InsertText (a->value); - return; + if (!strcasecmp (cmd_argv[0], a->name)) + { + Cbuf_InsertText (a->value); + cmd_tokenizebufferpos = oldpos; + return; + } } } -// check cvars - if (!Cvar_Command ()) - Con_Printf ("Unknown command \"%s\"\n", Cmd_Argv(0)); +// check cvars (always) + if (!Cvar_Command () && host_initialized) + Con_Printf("Unknown command \"%s\"\n", Cmd_Argv(0)); + + cmd_tokenizebufferpos = oldpos; } /* =================== -Cmd_ForwardToServer +Cmd_ForwardStringToServer -Sends the entire command line over to the server +Sends an entire command string over to the server, unprocessed =================== */ -void Cmd_ForwardToServer (void) +void Cmd_ForwardStringToServer (const char *s) { if (cls.state != ca_connected) { - Con_Printf ("Can't \"%s\", not connected\n", Cmd_Argv(0)); + Con_Printf("Can't \"%s\", not connected\n", s); return; } if (cls.demoplayback) return; // not really connected - MSG_WriteByte (&cls.message, clc_stringcmd); - if (Q_strcasecmp(Cmd_Argv(0), "cmd") != 0) - { - SZ_Print (&cls.message, Cmd_Argv(0)); - SZ_Print (&cls.message, " "); - } - if (Cmd_Argc() > 1) - SZ_Print (&cls.message, Cmd_Args()); + // 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, s, strlen(s) + 1); +} + +/* +=================== +Cmd_ForwardToServer + +Sends the entire command line over to the server +=================== +*/ +void Cmd_ForwardToServer (void) +{ + const char *s; + if (strcasecmp(Cmd_Argv(0), "cmd")) + s = va("%s %s", Cmd_Argv(0), Cmd_Argc() > 1 ? Cmd_Args() : ""); else - SZ_Print (&cls.message, "\n"); + s = Cmd_Argc() > 1 ? Cmd_Args() : ""; + Cmd_ForwardStringToServer(s); } @@ -877,7 +903,7 @@ int Cmd_CheckParm (const char *parm) Sys_Error ("Cmd_CheckParm: NULL"); for (i = 1; i < Cmd_Argc (); i++) - if (!Q_strcasecmp (parm, Cmd_Argv (i))) + if (!strcasecmp (parm, Cmd_Argv (i))) return i; return 0;