X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cmd.c;h=f8c3f1fcf633fd42eab313aa570b777d106d87c7;hp=6bb726f458f9e8b711435dd717c18fa23906dcd6;hb=8a092a84b4409b8e2fa4fd5a03e88c2c2ea7d255;hpb=400e4a34bbef54082e7d39758fa5aa7ab1b654c7 diff --git a/cmd.c b/cmd.c index 6bb726f4..f8c3f1fc 100644 --- a/cmd.c +++ b/cmd.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -21,23 +21,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -void Cmd_ForwardToServer (void); - #define MAX_ALIAS_NAME 32 typedef struct cmdalias_s { - struct cmdalias_s *next; - char name[MAX_ALIAS_NAME]; - char *value; + struct cmdalias_s *next; + char name[MAX_ALIAS_NAME]; + char *value; } cmdalias_t; -cmdalias_t *cmd_alias; +static cmdalias_t *cmd_alias; + +static qboolean cmd_wait; -int trashtest; -int *trashspot; +static mempool_t *cmd_mempool; -qboolean cmd_wait; +#define CMD_TOKENIZELENGTH 4096 +static char cmd_tokenizebuffer[CMD_TOKENIZELENGTH]; +static int cmd_tokenizebufferpos = 0; //============================================================================= @@ -50,7 +51,7 @@ next frame. This allows commands like: bind g "impulse 5 ; +attack ; wait ; -attack ; impulse 2" ============ */ -void Cmd_Wait_f (void) +static void Cmd_Wait_f (void) { cmd_wait = true; } @@ -63,7 +64,7 @@ void Cmd_Wait_f (void) ============================================================================= */ -sizebuf_t cmd_text; +static sizebuf_t cmd_text; /* ============ @@ -72,7 +73,8 @@ Cbuf_Init */ void Cbuf_Init (void) { - SZ_Alloc (&cmd_text, 8192); // space for commands and script files + // LordHavoc: inreased this from 8192 to 32768 + SZ_Alloc (&cmd_text, 32768, "command buffer"); // space for commands and script files } @@ -83,15 +85,15 @@ Cbuf_AddText Adds command text at the end of the buffer ============ */ -void Cbuf_AddText (char *text) +void Cbuf_AddText (const char *text) { int l; - + l = strlen (text); if (cmd_text.cursize + l >= cmd_text.maxsize) { - Con_Printf ("Cbuf_AddText: overflow\n"); + Con_Print("Cbuf_AddText: overflow\n"); return; } @@ -108,30 +110,30 @@ Adds a \n to the text FIXME: actually change the command buffer to do less copying ============ */ -void Cbuf_InsertText (char *text) +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 - -// add the entire text of the file + temp = NULL; + + // 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); } } @@ -142,11 +144,14 @@ Cbuf_Execute */ void Cbuf_Execute (void) { - int i; - char *text; - char line[1024]; - int quotes; - + int i; + char *text; + 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 @@ -159,14 +164,13 @@ 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; } - - + memcpy (line, text, i); line[i] = 0; - + // delete the text from the command buffer and move remaining commands down // this is necessary because commands (exec, alias) can insert data at the // beginning of the text buffer @@ -177,12 +181,12 @@ 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 Cmd_ExecuteString (line, src_command); - + if (cmd_wait) { // skip out while text still remains in buffer, leaving it // for next frame @@ -212,66 +216,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"); + Con_Print("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); } @@ -280,28 +263,26 @@ void Cmd_StuffCmds_f (void) Cmd_Exec_f =============== */ -void Cmd_Exec_f (void) +static void Cmd_Exec_f (void) { - char *f; - int mark; + char *f; if (Cmd_Argc () != 2) { - Con_Printf ("exec : execute a script file\n"); + Con_Print("exec : execute a script file\n"); return; } - mark = Hunk_LowMark (); - f = (char *)COM_LoadHunkFile (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); - Hunk_FreeToLowMark (mark); + Mem_Free(f); } @@ -312,13 +293,13 @@ Cmd_Echo_f Just prints the rest of the line to the console =============== */ -void Cmd_Echo_f (void) +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; } - // if the alias allready exists, reuse it + // if the alias already exists, reuse it for (a = cmd_alias ; a ; a=a->next) { if (!strcmp(s, a->name)) @@ -376,20 +347,21 @@ 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"); - - a->value = CopyString (cmd); + strlcat (cmd, "\n", sizeof (cmd)); + + a->value = Z_Malloc (strlen (cmd) + 1); + strcpy (a->value, cmd); } /* @@ -402,23 +374,65 @@ void Cmd_Alias_f (void) typedef struct cmd_function_s { - struct cmd_function_s *next; - char *name; - xcommand_t function; + struct cmd_function_s *next; + const char *name; + xcommand_t function; } cmd_function_t; #define MAX_ARGS 80 -static int cmd_argc; -static char *cmd_argv[MAX_ARGS]; -static char *cmd_null_string = ""; -static char *cmd_args = NULL; +static int cmd_argc; +static const char *cmd_argv[MAX_ARGS]; +static const char *cmd_null_string = ""; +static const char *cmd_args = NULL; + +cmd_source_t cmd_source; + + +static cmd_function_t *cmd_functions; // possible commands to execute + +/* +======== +Cmd_List + + CmdList Added by EvilTypeGuy eviltypeguy@qeradiant.com + Thanks to Matthias "Maddes" Buecher, http://www.inside3d.com/qip/ + +======== +*/ +static void Cmd_List_f (void) +{ + cmd_function_t *cmd; + const char *partial; + int len, count; + + if (Cmd_Argc() > 1) + { + partial = Cmd_Argv (1); + len = strlen(partial); + } + else + { + partial = NULL; + len = 0; + } -cmd_source_t cmd_source; + count = 0; + for (cmd = cmd_functions; cmd; cmd = cmd->next) + { + if (partial && strncmp(partial, cmd->name, len)) + continue; + Con_Printf("%s\n", cmd->name); + count++; + } + Con_Printf("%i Command%s", count, (count > 1) ? "s" : ""); + if (partial) + Con_Printf(" beginning with \"%s\"", partial); -static cmd_function_t *cmd_functions; // possible commands to execute + Con_Print("\n\n"); +} /* ============ @@ -427,6 +441,8 @@ Cmd_Init */ void Cmd_Init (void) { + cmd_mempool = Mem_AllocPool("commands", 0, NULL); + // // register our commands // @@ -436,6 +452,21 @@ void Cmd_Init (void) 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_Shutdown +============ +*/ +void Cmd_Shutdown(void) +{ + Mem_FreePool(&cmd_mempool); } /* @@ -453,11 +484,11 @@ int Cmd_Argc (void) Cmd_Argv ============ */ -char *Cmd_Argv (int arg) +const char *Cmd_Argv (int arg) { if (arg >= cmd_argc ) return cmd_null_string; - return cmd_argv[arg]; + return cmd_argv[arg]; } /* @@ -465,7 +496,7 @@ char *Cmd_Argv (int arg) Cmd_Args ============ */ -char *Cmd_Args (void) +const char *Cmd_Args (void) { return cmd_args; } @@ -478,49 +509,47 @@ Cmd_TokenizeString Parses the given string into command line tokens. ============ */ -void Cmd_TokenizeString (char *text) +static void Cmd_TokenizeString (const char *text) { - int i; - -// clear the args from the last string - for (i=0 ; i CMD_TOKENIZELENGTH) + Sys_Error("Cmd_TokenizeString: ran out of %i character buffer space for command arguements\n", CMD_TOKENIZELENGTH); + strcpy (cmd_tokenizebuffer + cmd_tokenizebufferpos, com_token); + cmd_argv[cmd_argc] = cmd_tokenizebuffer + cmd_tokenizebufferpos; + cmd_tokenizebufferpos += l; cmd_argc++; } } - + } @@ -529,31 +558,28 @@ void Cmd_TokenizeString (char *text) Cmd_AddCommand ============ */ -void Cmd_AddCommand (char *cmd_name, xcommand_t function) +void Cmd_AddCommand (const char *cmd_name, xcommand_t function) { - cmd_function_t *cmd; - - if (host_initialized) // because hunk allocation would get stomped - Sys_Error ("Cmd_AddCommand after host_initialized"); - + cmd_function_t *cmd; + // 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; } - + // fail if the command already exists for (cmd=cmd_functions ; cmd ; cmd=cmd->next) { 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; } } - cmd = Hunk_AllocName (sizeof(cmd_function_t), "commands"); + cmd = Mem_Alloc(cmd_mempool, sizeof(cmd_function_t)); cmd->name = cmd_name; cmd->function = function; cmd->next = cmd_functions; @@ -565,44 +591,182 @@ void Cmd_AddCommand (char *cmd_name, xcommand_t function) Cmd_Exists ============ */ -qboolean Cmd_Exists (char *cmd_name) +qboolean Cmd_Exists (const char *cmd_name) { cmd_function_t *cmd; for (cmd=cmd_functions ; cmd ; cmd=cmd->next) - { if (!strcmp (cmd_name,cmd->name)) return true; - } return false; } - /* ============ Cmd_CompleteCommand ============ */ -char *Cmd_CompleteCommand (char *partial) +const char *Cmd_CompleteCommand (const char *partial) { - cmd_function_t *cmd; - int len; - + cmd_function_t *cmd; + int len; + len = strlen(partial); - + if (!len) return NULL; - + // check functions - for (cmd=cmd_functions ; cmd ; cmd=cmd->next) - if (!strncmp (partial,cmd->name, len)) + for (cmd = cmd_functions; cmd; cmd = cmd->next) + if (!strncmp(partial, cmd->name, len)) return cmd->name; return NULL; } +/* + Cmd_CompleteCountPossible + + New function for tab-completion system + Added by EvilTypeGuy + Thanks to Fett erich@heintz.com + Thanks to taniwha + +*/ +int Cmd_CompleteCountPossible (const char *partial) +{ + cmd_function_t *cmd; + int len, h; + + h = 0; + len = strlen(partial); + + if (!len) + return 0; + + // Loop through the command list and count all partial matches + for (cmd = cmd_functions; cmd; cmd = cmd->next) + if (!strncasecmp(partial, cmd->name, len)) + h++; + + return h; +} + +/* + Cmd_CompleteBuildList + + New function for tab-completion system + Added by EvilTypeGuy + Thanks to Fett erich@heintz.com + Thanks to taniwha + +*/ +const char **Cmd_CompleteBuildList (const char *partial) +{ + cmd_function_t *cmd; + int len = 0; + int bpos = 0; + int sizeofbuf = (Cmd_CompleteCountPossible (partial) + 1) * sizeof (const char *); + const char **buf; + + len = strlen(partial); + buf = Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *)); + // Loop through the alias list and print all matches + for (cmd = cmd_functions; cmd; cmd = cmd->next) + if (!strncasecmp(partial, cmd->name, len)) + buf[bpos++] = cmd->name; + + buf[bpos] = NULL; + return buf; +} + +/* + Cmd_CompleteAlias + + New function for tab-completion system + Added by EvilTypeGuy + Thanks to Fett erich@heintz.com + Thanks to taniwha + +*/ +const char *Cmd_CompleteAlias (const char *partial) +{ + cmdalias_t *alias; + int len; + + len = strlen(partial); + + if (!len) + return NULL; + + // Check functions + for (alias = cmd_alias; alias; alias = alias->next) + if (!strncasecmp(partial, alias->name, len)) + return alias->name; + + return NULL; +} + +/* + Cmd_CompleteAliasCountPossible + + New function for tab-completion system + Added by EvilTypeGuy + Thanks to Fett erich@heintz.com + Thanks to taniwha + +*/ +int Cmd_CompleteAliasCountPossible (const char *partial) +{ + cmdalias_t *alias; + int len; + int h; + + h = 0; + + len = strlen(partial); + + if (!len) + return 0; + + // Loop through the command list and count all partial matches + for (alias = cmd_alias; alias; alias = alias->next) + if (!strncasecmp(partial, alias->name, len)) + h++; + + return h; +} + +/* + Cmd_CompleteAliasBuildList + + New function for tab-completion system + Added by EvilTypeGuy + Thanks to Fett erich@heintz.com + Thanks to taniwha + +*/ +const char **Cmd_CompleteAliasBuildList (const char *partial) +{ + cmdalias_t *alias; + int len = 0; + int bpos = 0; + int sizeofbuf = (Cmd_CompleteAliasCountPossible (partial) + 1) * sizeof (const char *); + const char **buf; + + len = strlen(partial); + buf = Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *)); + // Loop through the alias list and print all matches + for (alias = cmd_alias; alias; alias = alias->next) + if (!strncasecmp(partial, alias->name, len)) + buf[bpos++] = alias->name; + + buf[bpos] = NULL; + return buf; +} + /* ============ Cmd_ExecuteString @@ -611,73 +775,99 @@ A complete command line has been parsed, so try to execute it FIXME: lookupnoadd the token to speed search? ============ */ -void Cmd_ExecuteString (char *text, cmd_source_t src) -{ - cmd_function_t *cmd; - cmdalias_t *a; +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); } @@ -690,16 +880,17 @@ where the given parameter apears, or 0 if not present ================ */ -int Cmd_CheckParm (char *parm) +int Cmd_CheckParm (const char *parm) { int i; - + if (!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; } +