added comment support to COM_ReadAndTokenizeLine

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

diff --git a/common.c b/common.c
index e56f200bef9b69fcdb58d85e93cc94614b138f0d..80b78791150cb3e111799302ef1fd26bcb4398d4 100644 (file)
--- a/common.c
+++ b/common.c
@@ -885,18 +885,27 @@ int COM_StringBeginsWith(const char *s, const char *match)
        return true;
 }
 
-int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize)
+int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize, const char *commentprefix)
 {
-       int argc;
+       int argc, commentprefixlength;
        char *tokenbufend;
        const char *l;
        argc = 0;
        tokenbufend = tokenbuf + tokenbufsize;
        l = *text;
+       commentprefixlength = 0;
+       if (commentprefix)
+               commentprefixlength = strlen(commentprefix);
        while (*l && *l != '\n')
        {
                if (*l > ' ')
                {
+                       if (commentprefixlength && !strncmp(l, commentprefix, commentprefixlength))
+                       {
+                               while (*l && *l != '\n')
+                                       l++;
+                               break;
+                       }
                        if (argc >= maxargc)
                                return -1;
                        argv[argc++] = tokenbuf;

diff --git a/common.h b/common.h
index a10242a6e7097382be8489d96c96c7849c24cf8c..05dae49bf519a222db03cb0fe8f41d666bdcf887 100644 (file)
--- a/common.h
+++ b/common.h
@@ -180,7 +180,7 @@ void COM_ToLowerString (const char *in, char *out, size_t size_out);
 void COM_ToUpperString (const char *in, char *out, size_t size_out);
 int COM_StringBeginsWith(const char *s, const char *match);
 
-int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize);
+int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize, const char *commentprefix);
 
 typedef struct stringlist_s
 {