adding my own IPv6 master server: dpmaster.div0.qc.to - default master server 4 ...

[xonotic/darkplaces.git] / cmd.c

diff --git a/cmd.c b/cmd.c
index 3457a534062c3e92c1da72c5f16c163bfaec428c..995473c6e6936a60695b13e8b1ac06d5fd28e1e9 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -21,17 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-#define        MAX_ALIAS_NAME  32
-// this is the largest script file that can be executed in one step
-// LordHavoc: inreased this from 8192 to 32768
-// div0: increased this from 32k to 128k
-// div0: increased this from 128k to 640k which ought to be enough for anyone
-#define CMDBUFSIZE 655360
-// maximum number of parameters to a command
-#define        MAX_ARGS 80
-// maximum tokenizable commandline length (counting NUL terminations)
-#define CMD_TOKENIZELENGTH (MAX_INPUTLINE + MAX_ARGS)
-
 typedef struct cmdalias_s
 {
        struct cmdalias_s *next;
@@ -465,6 +454,7 @@ Cmd_Exec_f
 static void Cmd_Exec_f (void)
 {
        char *f;
+       const char *filename;
 
        if (Cmd_Argc () != 2)
        {
@@ -472,18 +462,26 @@ static void Cmd_Exec_f (void)
                return;
        }
 
-       f = (char *)FS_LoadFile (Cmd_Argv(1), tempmempool, false, NULL);
+       filename = Cmd_Argv(1);
+       if (!strcmp(filename, "config.cfg"))
+       {
+               filename = CONFIGFILENAME;
+               if (COM_CheckParm("-noconfig"))
+                       return; // don't execute config.cfg
+       }
+
+       f = (char *)FS_LoadFile (filename, tempmempool, false, NULL);
        if (!f)
        {
-               Con_Printf("couldn't exec %s\n",Cmd_Argv(1));
+               Con_Printf("couldn't exec %s\n",filename);
                return;
        }
-       Con_Printf("execing %s\n",Cmd_Argv(1));
+       Con_Printf("execing %s\n",filename);
 
        // if executing default.cfg for the first time, lock the cvar defaults
        // it may seem backwards to insert this text BEFORE the default.cfg
        // but Cbuf_InsertText inserts before, so this actually ends up after it.
-       if (!strcmp(Cmd_Argv(1), "default.cfg"))
+       if (strlen(filename) >= 11 && !strcmp(filename + strlen(filename) - 11, "default.cfg"))
                Cbuf_InsertText("\ncvar_lockdefaults\n");
 
        // insert newline after the text to make sure the last line is terminated (some text editors omit the trailing newline)
@@ -754,6 +752,10 @@ static const char *Cmd_GetDirectCvarValue(const char *varname, cmdalias_t *alias
                                *is_multiple = true;
                        return Cmd_Args();
                }
+               else if(!strcmp(varname, "#"))
+               {
+                       return va("%d", Cmd_Argc());
+               }
                else if(varname[strlen(varname) - 1] == '-')
                {
                        argno = strtol(varname, &endptr, 10);
@@ -855,6 +857,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;
@@ -885,7 +888,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)
@@ -1003,7 +1006,7 @@ static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned ma
                                        eat = varlen + 1;
                                }
                        } else {
-                               varlen = strspn(in, "*0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-");
+                               varlen = strspn(in, "#*0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-");
                                val = Cmd_GetCvarValue(in, varlen, alias);
                                eat = varlen;
                        }
@@ -1109,15 +1112,11 @@ static void Cmd_Apropos_f(void)
        cvar_t *cvar;
        cmdalias_t *alias;
        const char *partial;
-       size_t len;
        int count;
        qboolean ispattern;
 
        if (Cmd_Argc() > 1)
-       {
                partial = Cmd_Args();
-               len = strlen(partial);
-       }
        else
        {
                Con_Printf("usage: apropos <string>\n");
@@ -1126,10 +1125,7 @@ static void Cmd_Apropos_f(void)
 
        ispattern = partial && (strchr(partial, '*') || strchr(partial, '?'));
        if(!ispattern)
-       {
                partial = va("*%s*", partial);
-               len += 2;
-       }
 
        count = 0;
        for (cvar = cvar_vars; cvar; cvar = cvar->next)
@@ -1150,10 +1146,11 @@ static void Cmd_Apropos_f(void)
        }
        for (alias = cmd_alias; alias; alias = alias->next)
        {
+               // procede here a bit differently as an alias value always got a final \n
                if (!matchpattern_with_separator(alias->name, partial, true, "", false))
-               if (!matchpattern_with_separator(alias->value, partial, true, "", false))
+               if (!matchpattern_with_separator(alias->value, partial, true, "\n", false)) // when \n is as separator wildcards don't match it
                        continue;
-               Con_Printf("alias ^5%s^7: %s", alias->name, alias->value);
+               Con_Printf("alias ^5%s^7: %s", alias->name, alias->value); // do not print an extra \n
                count++;
        }
        Con_Printf("%i result%s\n\n", count, (count > 1) ? "s" : "");
@@ -1187,6 +1184,7 @@ void Cmd_Init_Commands (void)
        Cmd_AddCommand ("wait", Cmd_Wait_f, "make script execution wait for next rendered frame");
        Cmd_AddCommand ("set", Cvar_Set_f, "create or change the value of a console variable");
        Cmd_AddCommand ("seta", Cvar_SetA_f, "create or change the value of a console variable that will be saved to config.cfg");
+       Cmd_AddCommand ("unset", Cvar_Del_f, "delete a cvar (does not work for static ones like _cl_name, or read-only ones)");
 #ifdef FILLALLCVARSWITHRUBBISH
        Cmd_AddCommand ("fillallcvarswithrubbish", Cvar_FillAll_f, "fill all cvars with a specified number of characters to provoke buffer overruns");
 #endif /* FILLALLCVARSWITHRUBBISH */
@@ -1640,7 +1638,6 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src)
                                        Con_Printf("Command \"%s\" can not be executed\n", Cmd_Argv(0));
                                found = true;
                                goto command_found;
-                               break;
                        case src_client:
                                if (cmd->clientfunction)
                                {