X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cmd.c;h=2939779e7df4998188a63438d2ac90497da0542b;hp=169f9efacb28964006894f8e70bac6678b6bba45;hb=aa33d8f8642530f7f266d6cde1422f95aa74b2be;hpb=5cf8eacc9621cf85f9d0474e59289b13d083260f diff --git a/cmd.c b/cmd.c index 169f9efa..2939779e 100644 --- a/cmd.c +++ b/cmd.c @@ -64,19 +64,9 @@ static void Cmd_Wait_f (void) ============================================================================= */ -static sizebuf_t cmd_text; - -/* -============ -Cbuf_Init -============ -*/ -void Cbuf_Init (void) -{ // LordHavoc: inreased this from 8192 to 32768 - SZ_Alloc (&cmd_text, 32768, "command buffer"); // space for commands and script files -} - +static sizebuf_t cmd_text; +static qbyte cmd_text_buf[32768]; /* ============ @@ -89,15 +79,15 @@ void Cbuf_AddText (const char *text) { int l; - l = strlen (text); + l = (int)strlen (text); if (cmd_text.cursize + l >= cmd_text.maxsize) { - Con_Printf ("Cbuf_AddText: overflow\n"); + Con_Print("Cbuf_AddText: overflow\n"); return; } - SZ_Write (&cmd_text, text, strlen (text)); + SZ_Write (&cmd_text, (const qbyte *)text, (int)strlen (text)); } @@ -115,25 +105,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 = (char *)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); + SZ_Write (&cmd_text, (const qbyte *)temp, templen); + Mem_Free (temp); } } @@ -161,10 +151,10 @@ void Cbuf_Execute (void) for (i=0 ; i< cmd_text.cursize ; i++) { if (text[i] == '"') - quotes++; - if ( !(quotes&1) && text[i] == ';') + quotes ^= 1; + if ( !quotes && text[i] == ';') break; // don't break if inside a quoted string - if (text[i] == '\n') + if (text[i] == '\r' || text[i] == '\n') break; } @@ -181,7 +171,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 @@ -214,68 +204,49 @@ quake +prog jctest.qp +cmd amlev1 quake -nosound +cmd amlev1 =============== */ +qboolean host_stuffcmdsrun = false; 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); } @@ -290,17 +261,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 *)FS_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_DPrintf ("execing %s\n",Cmd_Argv(1)); + Con_DPrintf("execing %s\n",Cmd_Argv(1)); Cbuf_InsertText (f); Mem_Free(f); @@ -319,8 +290,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; } @@ -373,24 +335,35 @@ static void Cmd_Alias_f (void) if (!a) { - a = Z_Malloc (sizeof(cmdalias_t)); - a->next = cmd_alias; - cmd_alias = a; + cmdalias_t *prev, *current; + + a = (cmdalias_t *)Z_Malloc (sizeof(cmdalias_t)); + strlcpy (a->name, s, sizeof (a->name)); + // insert it at the right alphanumeric position + for( prev = NULL, current = cmd_alias ; current && strcmp( current->name, a->name ) < 0 ; prev = current, current = current->next ) + ; + if( prev ) { + prev->next = a; + } else { + cmd_alias = a; + } + a->next = current; } - strcpy (a->name, s); + // 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 = (char *)Z_Malloc (strlen (cmd) + 1); + strcpy (a->value, cmd); } /* @@ -421,6 +394,88 @@ cmd_source_t cmd_source; static cmd_function_t *cmd_functions; // possible commands to execute +/* +============ +Cmd_ExecuteAlias + +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 ]; + const char *in; + char *out; + unsigned outlen; + int inquote; + + in = alias->value; + out = buffer; + outlen = 0; + inquote = 0; + + while( *in && outlen < ALIAS_BUFFER ) + { + if( *in == '"' ) + { + inquote ^= 1; + } + else if( *in == '$' && !inquote ) + { + // $* is replaced with all formal parameters, $num is parsed as an argument (or as $num if there arent enough parameters), $bla becomes $bla and $$bla becomes $$bla + // read over the $ + in++; + if( *in == '*' ) + { + const char *linein = Cmd_Args(); + // include all params + if (linein) { + while( *linein && outlen < ALIAS_BUFFER ) { + *out++ = *linein++; + outlen++; + } + } + + in++; + } else { + char *nexttoken; + int argnum; + + argnum = strtol( in, &nexttoken, 10 ); + + if( 0 < argnum && argnum < Cmd_Argc() ) + { + const char *param = Cmd_Argv( argnum ); + while( *param && outlen < ALIAS_BUFFER ) { + *out++ = *param++; + outlen++; + } + in = nexttoken; + } + else if( argnum >= Cmd_Argc() ) + { + Con_Printf( "Warning: Not enough parameters passed to alias '%s', at least %i expected:\n %s\n", alias->name, argnum, alias->value ); + *out++ = '$'; + outlen++; + } + // not a number + else if( argnum == 0 ) + { + *out++ = '$'; + outlen++; + } + } + } else { + *out++ = *in++; + outlen++; + } + } + *out++ = '\n'; + *out++ = 0; + Cbuf_AddText( buffer ); +} + /* ======== Cmd_List @@ -439,7 +494,7 @@ static void Cmd_List_f (void) if (Cmd_Argc() > 1) { partial = Cmd_Argv (1); - len = strlen(partial); + len = (int)strlen(partial); } else { @@ -452,15 +507,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"); } /* @@ -470,8 +525,15 @@ Cmd_Init */ void Cmd_Init (void) { - cmd_mempool = Mem_AllocPool("commands"); + cmd_mempool = Mem_AllocPool("commands", 0, NULL); + // space for commands and script files + cmd_text.data = cmd_text_buf; + cmd_text.maxsize = sizeof(cmd_text_buf); + cmd_text.cursize = 0; +} +void Cmd_Init_Commands (void) +{ // // register our commands // @@ -484,6 +546,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); } /* @@ -536,12 +610,18 @@ static void Cmd_TokenizeString (const char *text) while (1) { // skip whitespace up to a /n - while (*text && *text <= ' ' && *text != '\n') + while (*text && *text <= ' ' && *text != '\r' && *text != '\n') text++; - if (*text == '\n') + // 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; } @@ -552,21 +632,46 @@ static void Cmd_TokenizeString (const char *text) if (cmd_argc == 1) cmd_args = text; - if (!COM_ParseToken (&text)) + if (!COM_ParseTokenConsole(&text)) return; + // check for $cvar + // (perhaps use another target buffer?) + if (com_token[0] == '$' && com_token[1]) + { + cvar_t *cvar; + + cvar = Cvar_FindVar(&com_token[1]); + if (cvar) + { + strcpy(com_token, cvar->string); + } + else if( com_token[1] == '$' ) + { + // remove the first $ + char *pos; + + for( pos = com_token ; *pos ; pos++ ) + { + *pos = *(pos + 1); + } + } + } + if (cmd_argc < MAX_ARGS) { - l = strlen(com_token) + 1; + l = (int)strlen(com_token) + 1; if (cmd_tokenizebufferpos + l > CMD_TOKENIZELENGTH) - Sys_Error("Cmd_TokenizeString: ran out of %i character buffer space for command arguements\n", CMD_TOKENIZELENGTH); + { + 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); cmd_argv[cmd_argc] = cmd_tokenizebuffer + cmd_tokenizebufferpos; cmd_tokenizebufferpos += l; cmd_argc++; } } - } @@ -578,11 +683,12 @@ Cmd_AddCommand void Cmd_AddCommand (const char *cmd_name, xcommand_t function) { cmd_function_t *cmd; + cmd_function_t *prev, *current; // fail if the command is a variable name - if (Cvar_VariableString(cmd_name)[0]) + if (Cvar_FindVar( cmd_name )) { - 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; } @@ -591,16 +697,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); + Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name); return; } } - cmd = Mem_Alloc(cmd_mempool, sizeof(cmd_function_t)); + cmd = (cmd_function_t *)Mem_Alloc(cmd_mempool, sizeof(cmd_function_t)); cmd->name = cmd_name; cmd->function = function; cmd->next = cmd_functions; - cmd_functions = cmd; + +// insert it at the right alphanumeric position + for( prev = NULL, current = cmd_functions ; current && strcmp( current->name, cmd->name ) < 0 ; prev = current, current = current->next ) + ; + if( prev ) { + prev->next = cmd; + } else { + cmd_functions = cmd; + } + cmd->next = current; } /* @@ -628,7 +743,7 @@ Cmd_CompleteCommand const char *Cmd_CompleteCommand (const char *partial) { cmd_function_t *cmd; - int len; + size_t len; len = strlen(partial); @@ -655,7 +770,8 @@ const char *Cmd_CompleteCommand (const char *partial) int Cmd_CompleteCountPossible (const char *partial) { cmd_function_t *cmd; - int len, h; + size_t len; + int h; h = 0; len = strlen(partial); @@ -683,13 +799,13 @@ int Cmd_CompleteCountPossible (const char *partial) 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 *); + size_t len = 0; + size_t bpos = 0; + size_t sizeofbuf = (Cmd_CompleteCountPossible (partial) + 1) * sizeof (const char *); const char **buf; len = strlen(partial); - buf = Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *)); + buf = (const char **)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)) @@ -711,7 +827,7 @@ const char **Cmd_CompleteBuildList (const char *partial) const char *Cmd_CompleteAlias (const char *partial) { cmdalias_t *alias; - int len; + size_t len; len = strlen(partial); @@ -738,7 +854,7 @@ const char *Cmd_CompleteAlias (const char *partial) int Cmd_CompleteAliasCountPossible (const char *partial) { cmdalias_t *alias; - int len; + size_t len; int h; h = 0; @@ -768,13 +884,13 @@ int Cmd_CompleteAliasCountPossible (const char *partial) 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 *); + size_t len = 0; + size_t bpos = 0; + size_t sizeofbuf = (Cmd_CompleteAliasCountPossible (partial) + 1) * sizeof (const char *); const char **buf; len = strlen(partial); - buf = Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *)); + buf = (const char **)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)) @@ -825,15 +941,15 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src) { if (!strcasecmp (cmd_argv[0], a->name)) { - Cbuf_InsertText (a->value); + Cmd_ExecuteAlias(a); cmd_tokenizebufferpos = oldpos; return; } } // check cvars - if (!Cvar_Command ()) - Con_Printf ("Unknown command \"%s\"\n", Cmd_Argv(0)); + if (!Cvar_Command () && host_framecount > 0) + Con_Printf("Unknown command \"%s\"\n", Cmd_Argv(0)); cmd_tokenizebufferpos = oldpos; } @@ -841,32 +957,53 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src) /* =================== -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 (strcasecmp(Cmd_Argv(0), "cmd") != 0) + // 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 qbyte *)s, (int)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")) { - SZ_Print (&cls.message, Cmd_Argv(0)); - SZ_Print (&cls.message, " "); + // we want to strip off "cmd", so just send the args + s = Cmd_Argc() > 1 ? Cmd_Args() : ""; } - if (Cmd_Argc() > 1) - SZ_Print (&cls.message, Cmd_Args()); else - SZ_Print (&cls.message, "\n"); + { + // we need to keep the command name, so send Cmd_Argv(0), a space and then Cmd_Args() + s = va("%s %s", Cmd_Argv(0), Cmd_Argc() > 1 ? Cmd_Args() : ""); + } + // don't send an empty forward message if the user tries "cmd" by itself + if (!s || !*s) + return; + Cmd_ForwardStringToServer(s); } @@ -884,7 +1021,10 @@ int Cmd_CheckParm (const char *parm) int i; if (!parm) - Sys_Error ("Cmd_CheckParm: NULL"); + { + Con_Printf ("Cmd_CheckParm: NULL"); + return 0; + } for (i = 1; i < Cmd_Argc (); i++) if (!strcasecmp (parm, Cmd_Argv (i)))