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 cbff83aa2f063312760a3bafa1c1963467018ecc..7b1562771e6ad8adb02690832581dbc3f76bec94 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -652,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));
 
@@ -801,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)
@@ -907,7 +913,7 @@ static char asis[] = "asis"; // just to suppress const char warnings
        {
                // 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"))
@@ -1055,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 );
 }