added linux timing code to SDL client for more accurate r_speeds reports

[xonotic/darkplaces.git] / cmd.c

diff --git a/cmd.c b/cmd.c
index 3457a534062c3e92c1da72c5f16c163bfaec428c..47e40a4faa343c6b2faa2def596e1ffa13496cb3 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,22 @@ 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;
+
+       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 +748,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);
@@ -1003,7 +1001,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;
                        }
@@ -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)
                                {