Cmd_QuoteString: make it also able to put the enclosing quotation marks

[xonotic/darkplaces.git] / cmd.c

diff --git a/cmd.c b/cmd.c
index 18cb6a13fc366e63cf2ba34bc2e0bbfc17cb2cad..7b1562771e6ad8adb02690832581dbc3f76bec94 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -281,7 +281,8 @@ void Cbuf_Execute (void)
        char line[MAX_INPUTLINE];
        char preprocessed[MAX_INPUTLINE];
        char *firstchar;
-       qboolean quotes, comment;
+       qboolean quotes;
+       char *comment;
 
        // LordHavoc: making sure the tokenizebuffer doesn't get filled up by repeated crashes
        cmd_tokenizebufferpos = 0;
@@ -293,7 +294,7 @@ void Cbuf_Execute (void)
                text = (char *)cmd_text.data;
 
                quotes = false;
-               comment = false;
+               comment = NULL;
                for (i=0 ; i < cmd_text.cursize ; i++)
                {
                        if(!comment)
@@ -311,7 +312,7 @@ void Cbuf_Execute (void)
                                else
                                {
                                        if(text[i] == '/' && text[i + 1] == '/' && (i == 0 || ISWHITESPACE(text[i-1])))
-                                               comment = true;
+                                               comment = &text[i];
                                        if(text[i] == ';')
                                                break;  // don't break if inside a quoted string or comment
                                }
@@ -329,8 +330,8 @@ void Cbuf_Execute (void)
                }
                else
                {
-                       memcpy (line, text, i);
-                       line[i] = 0;
+                       memcpy (line, text, comment ? (comment - text) : i);
+                       line[comment ? (comment - text) : i] = 0;
                }
 
 // delete the text from the command buffer and move remaining commands down
@@ -347,13 +348,15 @@ void Cbuf_Execute (void)
                }
 
 // execute the command line
-               firstchar = line + strspn(line, " \t");
+               firstchar = line;
+               while(*firstchar && ISWHITESPACE(*firstchar))
+                       ++firstchar;
                if(
-                       (strncmp(firstchar, "alias", 5) || (firstchar[5] != ' ' && firstchar[5] != '\t'))
+                       (strncmp(firstchar, "alias", 5) || !ISWHITESPACE(firstchar[5]))
                        &&
-                       (strncmp(firstchar, "bind", 4) || (firstchar[4] != ' ' && firstchar[4] != '\t'))
+                       (strncmp(firstchar, "bind", 4) || !ISWHITESPACE(firstchar[4]))
                        &&
-                       (strncmp(firstchar, "in_bind", 7) || (firstchar[7] != ' ' && firstchar[7] != '\t'))
+                       (strncmp(firstchar, "in_bind", 7) || !ISWHITESPACE(firstchar[7]))
                )
                {
                        Cmd_PreprocessString( line, preprocessed, sizeof(preprocessed), NULL );
@@ -649,11 +652,11 @@ static void Cmd_Alias_f (void)
 // 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++)
+       for (i=2 ; i < c ; i++)
        {
-               strlcat (cmd, Cmd_Argv(i), sizeof (cmd));
-               if (i != c)
+               if (i != 2)
                        strlcat (cmd, " ", sizeof (cmd));
+               strlcat (cmd, Cmd_Argv(i), sizeof (cmd));
        }
        strlcat (cmd, "\n", sizeof (cmd));
 
@@ -798,57 +801,63 @@ static const char *Cmd_GetDirectCvarValue(const char *varname, cmdalias_t *alias
        return NULL;
 }
 
-qboolean Cmd_QuoteString(char *out, size_t outlen, const char *in, const char *quoteset)
+qboolean Cmd_QuoteString(char *out, size_t outlen, const char *in, const char *quoteset, qboolean putquotes)
 {
        qboolean quote_quot = !!strchr(quoteset, '"');
        qboolean quote_backslash = !!strchr(quoteset, '\\');
        qboolean quote_dollar = !!strchr(quoteset, '$');
 
+       if(putquotes)
+       {
+               if(outlen <= 2)
+               {
+                       *out++ = 0;
+                       return false;
+               }
+               *out++ = '"'; --outlen;
+               --outlen;
+       }
+
        while(*in)
        {
                if(*in == '"' && quote_quot)
                {
                        if(outlen <= 2)
-                       {
-                               *out++ = 0;
-                               return false;
-                       }
+                               goto fail;
                        *out++ = '\\'; --outlen;
                        *out++ = '"'; --outlen;
                }
                else if(*in == '\\' && quote_backslash)
                {
                        if(outlen <= 2)
-                       {
-                               *out++ = 0;
-                               return false;
-                       }
+                               goto fail;
                        *out++ = '\\'; --outlen;
                        *out++ = '\\'; --outlen;
                }
                else if(*in == '$' && quote_dollar)
                {
                        if(outlen <= 2)
-                       {
-                               *out++ = 0;
-                               return false;
-                       }
+                               goto fail;
                        *out++ = '$'; --outlen;
                        *out++ = '$'; --outlen;
                }
                else
                {
                        if(outlen <= 1)
-                       {
-                               *out++ = 0;
-                               return false;
-                       }
+                               goto fail;
                        *out++ = *in; --outlen;
                }
                ++in;
        }
+       if(putquotes)
+               *out++ = '"';
        *out++ = 0;
        return true;
+fail:
+       if(putquotes)
+               *out++ = '"';
+       *out++ = 0;
+       return false;
 }
 
 static const char *Cmd_GetCvarValue(const char *var, size_t varlen, cmdalias_t *alias)
@@ -857,6 +866,7 @@ static const char *Cmd_GetCvarValue(const char *var, size_t varlen, cmdalias_t *
        static char varval[MAX_INPUTLINE];
        const char *varstr;
        char *varfunc;
+static char asis[] = "asis"; // just to suppress const char warnings
 
        if(varlen >= MAX_INPUTLINE)
                varlen = MAX_INPUTLINE - 1;
@@ -887,7 +897,7 @@ static const char *Cmd_GetCvarValue(const char *var, size_t varlen, cmdalias_t *
                varstr = Cmd_GetDirectCvarValue(varname, alias, &is_multiple);
                if(is_multiple)
                        if(!varfunc)
-                               varfunc = "asis";
+                               varfunc = asis;
        }
 
        if(!varstr)
@@ -903,7 +913,7 @@ static const char *Cmd_GetCvarValue(const char *var, size_t varlen, cmdalias_t *
        {
                // quote it so it can be used inside double quotes
                // we just need to replace " by \", and of course, double backslashes
-               Cmd_QuoteString(varval, sizeof(varval), varstr, "\"\\");
+               Cmd_QuoteString(varval, sizeof(varval), varstr, "\"\\", false);
                return varval;
        }
        else if(!strcmp(varfunc, "asis"))
@@ -1051,7 +1061,7 @@ static void Cmd_ExecuteAlias (cmdalias_t *alias)
        // Note: Cbuf_PreprocessString will be called on this string AGAIN! So we
        // have to make sure that no second variable expansion takes place, otherwise
        // alias parameters containing dollar signs can have bad effects.
-       Cmd_QuoteString(buffer2, sizeof(buffer2), buffer, "$");
+       Cmd_QuoteString(buffer2, sizeof(buffer2), buffer, "$", false);
        Cbuf_InsertText( buffer2 );
 }