console parsing now behaves like qwcl, thanks to Fuh for pointing out the problems...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3686 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cmd.c b/cmd.c
index b6436b3842cafa12786b1caf793fdf9c4c8c7764..d2b0b115531d382e90ee2782b0d9143c7ff53baf 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -552,7 +552,7 @@ static void Cmd_TokenizeString (const char *text)
                if (cmd_argc == 1)
                         cmd_args = text;
 
-               if (!COM_ParseToken(&text, false))
+               if (!COM_ParseTokenConsole(&text))
                        return;
 
                if (cmd_argc < MAX_ARGS)

diff --git a/common.c b/common.c
index c94ef45393152f7e49fcca09cac8bd258e5dde52..518ad5b9594d198fcc95bf6556347b506210d7fb 100644 (file)
--- a/common.c
+++ b/common.c
@@ -598,6 +598,81 @@ skipwhite:
        return true;
 }
 
+/*
+==============
+COM_ParseTokenConsole
+
+Parse a token out of a string, behaving like the qwcl console
+==============
+*/
+int COM_ParseTokenConsole(const char **datapointer)
+{
+       int c;
+       int len;
+       const char *data = *datapointer;
+
+       len = 0;
+       com_token[0] = 0;
+
+       if (!data)
+       {
+               *datapointer = NULL;
+               return false;
+       }
+
+// skip whitespace
+skipwhite:
+       while ((c = *data) <= ' ')
+       {
+               if (c == 0)
+               {
+                       // end of file
+                       *datapointer = NULL;
+                       return false;
+               }
+               data++;
+       }
+
+       // skip // comments
+       if (c == '/' && data[1] == '/')
+       {
+               while (*data && *data != '\n')
+                       data++;
+               goto skipwhite;
+       }
+
+// handle quoted strings specially
+       if (c == '\"')
+       {
+               data++;
+               while (1)
+               {
+                       c = *data++;
+                       if (c == '\"' || !c)
+                       {
+                               com_token[len] = 0;
+                               *datapointer = data;
+                               return true;
+                       }
+                       com_token[len] = c;
+                       len++;
+               }
+       }
+
+// parse a regular word
+       do
+       {
+               com_token[len] = c;
+               data++;
+               len++;
+               c = *data;
+       } while (c>32);
+
+       com_token[len] = 0;
+       *datapointer = data;
+       return true;
+}
+
 
 /*
 ================

diff --git a/common.h b/common.h
index e30c140303e2ad7b223b628bd0b1af609651b9e9..1ba72a8af89552f751d4cfc2c79aefcb14bbadec 100644 (file)
--- a/common.h
+++ b/common.h
@@ -143,6 +143,7 @@ float MSG_ReadDPCoord (void);
 extern char com_token[1024];
 
 int COM_ParseToken(const char **datapointer, int returnnewline);
+int COM_ParseTokenConsole(const char **datapointer);
 
 extern int com_argc;
 extern const char **com_argv;