From: havoc Date: Wed, 10 Aug 2005 10:23:26 +0000 (+0000) Subject: made Cmd_ForwardToServer code far more readable and prevented forwarding an empty... X-Git-Tag: xonotic-v0.1.0preview~4655 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1c1f47eb0bce0c14060f5a68d0c8e8edde8f3058;p=xonotic%2Fdarkplaces.git made Cmd_ForwardToServer code far more readable and prevented forwarding an empty string using cmd by itself git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5567 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/cmd.c b/cmd.c index 7f83d6dc..24ef9529 100644 --- a/cmd.c +++ b/cmd.c @@ -415,18 +415,18 @@ static void Cmd_ExecuteAlias (cmdalias_t *alias) outlen = 0; inquote = 0; - while( *in && outlen < ALIAS_BUFFER ) + while( *in && outlen < ALIAS_BUFFER ) { - if( *in == '"' ) + if( *in == '"' ) { inquote ^= 1; - } - else if( *in == '$' && !inquote ) + } + 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 == '*' ) + if( *in == '*' ) { const char *linein = Cmd_Args(); // include all params @@ -633,9 +633,9 @@ static void Cmd_TokenizeString (const char *text) if (!COM_ParseTokenConsole(&text)) return; - // check for $cvar + // check for $cvar // (perhaps use another target buffer?) - if (com_token[0] == '$' && com_token[1]) + if (com_token[0] == '$' && com_token[1]) { cvar_t *cvar; @@ -648,7 +648,7 @@ static void Cmd_TokenizeString (const char *text) { // remove the first $ char *pos; - + for( pos = com_token ; *pos ; pos++ ) { *pos = *(pos + 1); @@ -988,10 +988,19 @@ 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 + if (!strcasecmp(Cmd_Argv(0), "cmd")) + { + // we want to strip off "cmd", so just send the args s = Cmd_Argc() > 1 ? Cmd_Args() : ""; + } + else + { + // 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); }