memcpy (SZ_GetSpace(buf,length),data,length);
}
-void SZ_Print (sizebuf_t *buf, const char *data)
-{
- int len;
- len = strlen(data)+1;
-
-// byte * cast to keep VC++ happy
- if (buf->data[buf->cursize-1])
- memcpy ((qbyte *)SZ_GetSpace(buf, len),data,len); // no trailing 0
- else
- memcpy ((qbyte *)SZ_GetSpace(buf, len-1)-1,data,len); // write over trailing 0
-}
+// LordHavoc: thanks to Fuh for bringing the pure evil of SZ_Print to my
+// attention, it has been eradicated from here, its only (former) use in
+// all of darkplaces.
static char *hexchar = "0123456789ABCDEF";
void Com_HexDumpToConsole(const qbyte *data, int size)
*/
int COM_ParseToken(const char **datapointer, int returnnewline)
{
- int c;
int len;
const char *data = *datapointer;
// skip whitespace
skipwhite:
- while ((c = *data) <= ' ' && (c != '\n' || !returnnewline))
+ for (;*data <= ' ' && (*data != '\n' || !returnnewline);data++)
{
- if (c == 0)
+ if (*data == 0)
{
// end of file
*datapointer = NULL;
return false;
}
- data++;
}
- // check if it's a comment
- if (c == '/')
+ if (data[0] == '/' && data[1] == '/')
+ {
+ // comment
+ while (*data && *data != '\n')
+ data++;
+ goto skipwhite;
+ }
+ else if (data[0] == '/' && data[1] == '*')
+ {
+ // comment
+ data++;
+ while (*data && (data[0] != '*' || data[1] != '/'))
+ data++;
+ data += 2;
+ goto skipwhite;
+ }
+ else if (*data == '\"')
{
- // skip // comments
- if (data[1] == '/')
+ // quoted string
+ for (data++;*data != '\"';data++)
{
- while (*data && *data != '\n')
- data++;
- goto skipwhite;
+ if (!*data || len >= (int)sizeof(com_token) - 1)
+ {
+ com_token[0] = 0;
+ *datapointer = NULL;
+ return false;
+ }
+ com_token[len++] = *data;
}
- // skip /* comments
- if (data[1] == '*')
+ com_token[len] = 0;
+ *datapointer = data+1;
+ return true;
+ }
+ else if (*data == '\n' || *data == '{' || *data == '}' || *data == ')' || *data == '(' || *data == ']' || *data == '[' || *data == '\'' || *data == ':' || *data == ',' || *data == ';')
+ {
+ // single character
+ com_token[len++] = *data++;
+ com_token[len] = 0;
+ *datapointer = data;
+ return true;
+ }
+ else
+ {
+ // regular word
+ for (;*data > ' ' && *data != '{' && *data != '}' && *data != ')' && *data != '(' && *data != ']' && *data != '[' && *data != '\'' && *data != ':' && *data != ',' && *data != ';';data++)
{
- while (*data && *data != '*' && data[1] != '/')
- data++;
- goto skipwhite;
+ if (len >= (int)sizeof(com_token) - 1)
+ {
+ com_token[0] = 0;
+ *datapointer = NULL;
+ return false;
+ }
+ com_token[len++] = *data;
}
+ com_token[len] = 0;
+ *datapointer = data;
+ return true;
}
+}
-// handle quoted strings specially
- if (c == '\"')
+/*
+==============
+COM_ParseTokenConsole
+
+Parse a token out of a string, behaving like the qwcl console
+==============
+*/
+int COM_ParseTokenConsole(const char **datapointer)
+{
+ int len;
+ const char *data = *datapointer;
+
+ len = 0;
+ com_token[0] = 0;
+
+ if (!data)
{
- data++;
- while (1)
+ *datapointer = NULL;
+ return false;
+ }
+
+// skip whitespace
+skipwhite:
+ for (;*data <= ' ';data++)
+ {
+ if (*data == 0)
{
- c = *data++;
- if (c == '\"' || !c)
- {
- com_token[len] = 0;
- *datapointer = data;
- return true;
- }
- com_token[len] = c;
- len++;
+ // end of file
+ *datapointer = NULL;
+ return false;
}
}
-// parse single characters
- if (c == '{' || c == '}' || c == ')' || c == '(' || c == ']' || c == '[' || c == '\'' || c == ':' || c == ',' || c == ';' || c == '\n')
+ if (*data == '/' && data[1] == '/')
{
- com_token[len] = c;
- len++;
+ // comment
+ while (*data && *data != '\n')
+ data++;
+ goto skipwhite;
+ }
+ else if (*data == '\"')
+ {
+ // quoted string
+ for (data++;*data != '\"';data++)
+ {
+ if (!*data || len >= (int)sizeof(com_token) - 1)
+ {
+ com_token[0] = 0;
+ *datapointer = NULL;
+ return false;
+ }
+ com_token[len++] = *data;
+ }
com_token[len] = 0;
*datapointer = data+1;
return true;
}
-
-// parse a regular word
- do
+ else
{
- com_token[len] = c;
- data++;
- len++;
- c = *data;
- if (c == '{' || c == '}' || c == ')' || c == '(' || c == ']' || c == '[' || c == '\'' || c == ':' || c == ',' || c == ';')
- break;
- } while (c>32);
-
- com_token[len] = 0;
- *datapointer = data;
- return true;
+ // regular word
+ for (;*data > ' ';data++)
+ {
+ if (len >= (int)sizeof(com_token) - 1)
+ {
+ com_token[0] = 0;
+ *datapointer = NULL;
+ return false;
+ }
+ com_token[len++] = *data;
+ }
+ com_token[len] = 0;
+ *datapointer = data;
+ return true;
+ }
}
gamemode = GAME_BATTLEMECH;
else if (strstr(name, "zymotic"))
gamemode = GAME_ZYMOTIC;
+ else if (strstr(name, "fniggium"))
+ gamemode = GAME_FNIGGIUM;
+ else if (strstr(name, "setheral"))
+ gamemode = GAME_SETHERAL;
+ else if (strstr(name, "som"))
+ gamemode = GAME_SOM;
+ else if (strstr(name, "tenebrae"))
+ gamemode = GAME_TENEBRAE;
else
gamemode = GAME_NORMAL;
gamemode = GAME_BATTLEMECH;
else if (COM_CheckParm ("-zymotic"))
gamemode = GAME_ZYMOTIC;
+ else if (COM_CheckParm ("-fniggium"))
+ gamemode = GAME_FNIGGIUM;
+ else if (COM_CheckParm ("-setheral"))
+ gamemode = GAME_SETHERAL;
+ else if (COM_CheckParm ("-som"))
+ gamemode = GAME_SOM;
+ else if (COM_CheckParm ("-tenebrae"))
+ gamemode = GAME_TENEBRAE;
switch(gamemode)
{
break;
case GAME_TRANSFUSION:
gamename = "Transfusion";
- gamedirname = "transfusion";
+ gamedirname = "basetf";
break;
case GAME_GOODVSBAD2:
gamename = "GoodVs.Bad2";
gamename = "Zymotic";
gamedirname = "data";
break;
+ case GAME_FNIGGIUM:
+ gamename = "Fniggium";
+ gamedirname = "data";
+ break;
+ case GAME_SETHERAL:
+ gamename = "Setheral";
+ gamedirname = "data";
+ break;
+ case GAME_SOM:
+ gamename = "Son of Man";
+ gamedirname = "data";
+ break;
+ case GAME_TENEBRAE:
+ gamename = "DarkPlaces-Tenebrae";
+ gamedirname = "tenebrae";
+ break;
default:
Sys_Error("COM_InitGameType: unknown gamemode %i\n", gamemode);
break;
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;
/* $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $ */
-// Most (all?) BSDs already have them
-#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
-
+#ifndef HAVE_STRLCAT
size_t
strlcat(char *dst, const char *src, size_t siz)
{
return(dlen + (s - src)); /* count does not include NUL */
}
+#endif // #ifndef HAVE_STRLCAT
+
+#ifndef HAVE_STRLCPY
size_t
strlcpy(char *dst, const char *src, size_t siz)
{
return(s - src - 1); /* count does not include NUL */
}
-#endif // #if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+#endif // #ifndef HAVE_STRLCPY
projects / xonotic / darkplaces.git / blobdiff