fix typo compile erorr

[xonotic/darkplaces.git] / cvar.c

diff --git a/cvar.c b/cvar.c
index afdbcf057cedde987ee1767d36c4a93242bd2574..a6734b53adc892a02f8b97db9a1dcbe056488723 100644 (file)
--- a/cvar.c
+++ b/cvar.c
@@ -493,6 +493,13 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *ne
                return cvar;
        }
 
+// check for pure evil
+       if (!*name)
+       {
+               Con_Printf("Cvar_Get: invalid variable name\n");
+               return NULL;
+       }
+
 // check for overlap with a command
        if (Cmd_Exists (name))
        {
@@ -563,7 +570,7 @@ qboolean    Cvar_Command (void)
 // perform a variable print or set
        if (Cmd_Argc() == 1)
        {
-               Con_Printf("\"%s\" is \"%s\" [\"%s\"]\n", v->name, ((v->flags & CVAR_PRIVATE) ? "********" : v->string), v->defstring);
+               Con_Printf("\"%s\" is \"%s\" [\"%s\"]\n", v->name, ((v->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : v->string), v->defstring);
                return true;
        }
 
@@ -653,11 +660,16 @@ with the archive flag set to true.
 void Cvar_WriteVariables (qfile_t *f)
 {
        cvar_t  *var;
+       char buf1[MAX_INPUTLINE], buf2[MAX_INPUTLINE];
 
        // don't save cvars that match their default value
        for (var = cvar_vars ; var ; var = var->next)
                if ((var->flags & CVAR_SAVE) && (strcmp(var->string, var->defstring) || (var->flags & CVAR_ALLOCATED)))
-                       FS_Printf(f, "%s%s \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", var->name, var->string);
+               {
+                       Cmd_QuoteString(buf1, sizeof(buf1), var->name, "\"\\$");
+                       Cmd_QuoteString(buf2, sizeof(buf2), var->string, "\"\\$");
+                       FS_Printf(f, "%s\"%s\" \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", buf1, buf2);
+               }
 }
 
 
@@ -695,7 +707,7 @@ void Cvar_List_f (void)
                if (len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp (partial,cvar->name,len)))
                        continue;
 
-               Con_Printf("%s is \"%s\" [\"%s\"] %s\n", cvar->name, ((cvar->flags & CVAR_PRIVATE) ? "********" : cvar->string), cvar->defstring, cvar->description);
+               Con_Printf("%s is \"%s\" [\"%s\"] %s\n", cvar->name, ((cvar->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring, cvar->description);
                count++;
        }