X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=common.c;h=a1f1b405154b6c0a2db4ece6f774294c65df98f9;hb=a0f50a719fce55819b2cc03da7684ddfc38e0aa9;hp=f9c2a5ae2c6546ab0524a018356c258e05bef68c;hpb=7baa89eb79dceb9c02213028c8c6598e17348916;p=xonotic%2Fdarkplaces.git

diff --git a/common.c b/common.c
index f9c2a5ae..a1f1b405 100644
--- a/common.c
+++ b/common.c
@@ -353,16 +353,10 @@ int MSG_ReadBytes (int numbytes, unsigned char *out)
 	return l;
 }
 
-// used by server (always latest PROTOCOL_DARKPLACES)
-float MSG_ReadDPCoord (void)
-{
-	return (signed short) MSG_ReadLittleShort();
-}
-
 // used by client
 float MSG_ReadCoord (void)
 {
-	if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
+	if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5)
 		return (signed short) MSG_ReadLittleShort();
 	else if (cl.protocol == PROTOCOL_DARKPLACES1)
 		return MSG_ReadLittleFloat();
@@ -425,17 +419,9 @@ void SZ_Write (sizebuf_t *buf, const void *data, int length)
 	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)
@@ -508,7 +494,6 @@ Parse a token out of a string
 */
 int COM_ParseToken(const char **datapointer, int returnnewline)
 {
-	int c;
 	int len;
 	const char *data = *datapointer;
 
@@ -523,78 +508,150 @@ int COM_ParseToken(const char **datapointer, int returnnewline)
 
 // 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] == '*')
 	{
-		// skip // comments
-		if (data[1] == '/')
+		// comment
+		data++;
+		while (*data && (data[0] != '*' || data[1] != '/'))
+			data++;
+		data += 2;
+		goto skipwhite;
+	}
+	else if (*data == '\"')
+	{
+		// 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;
+	}
+}
+
+/*
+==============
+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)
+	{
+		*datapointer = NULL;
+		return false;
 	}
 
-// handle quoted strings specially
-	if (c == '\"')
+// skip whitespace
+skipwhite:
+	for (;*data <= ' ';data++)
 	{
-		data++;
-		while (1)
+		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] == '/')
+	{
+		// comment
+		while (*data && *data != '\n')
+			data++;
+		goto skipwhite;
+	}
+	else if (*data == '\"')
 	{
-		com_token[len] = c;
-		len++;
+		// 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;
+	}
 }
 
 
@@ -675,8 +732,8 @@ void COM_InitArgv (void)
 void COM_InitGameType (void)
 {
 	char name[MAX_OSPATH];
-	FS_StripExtension(com_argv[0], name);
-	COM_ToLowerString(name, name);
+	FS_StripExtension (com_argv[0], name, sizeof (name));
+	COM_ToLowerString (name, name, sizeof (name));
 
 	if (strstr(name, "transfusion"))
 		gamemode = GAME_TRANSFUSION;
@@ -696,6 +753,14 @@ void COM_InitGameType (void)
 		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;
 
@@ -719,6 +784,14 @@ void COM_InitGameType (void)
 		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)
 	{
@@ -744,7 +817,7 @@ void COM_InitGameType (void)
 		break;
 	case GAME_TRANSFUSION:
 		gamename = "Transfusion";
-		gamedirname = "transfusion";
+		gamedirname = "basetf";
 		break;
 	case GAME_GOODVSBAD2:
 		gamename = "GoodVs.Bad2";
@@ -762,6 +835,22 @@ void COM_InitGameType (void)
 		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;
@@ -835,7 +924,7 @@ char *va(const char *format, ...)
 	s = string[stringindex];
 	stringindex = (stringindex + 1) & 7;
 	va_start (argptr, format);
-	vsprintf (s, format,argptr);
+	vsnprintf (s, sizeof (string[0]), format,argptr);
 	va_end (argptr);
 
 	return s;
@@ -843,28 +932,37 @@ char *va(const char *format, ...)
 
 
 //======================================
-// LordHavoc: added these because they are useful
 
-void COM_ToLowerString(const char *in, char *out)
+void COM_ToLowerString (const char *in, char *out, size_t size_out)
 {
-	while (*in)
+	if (size_out == 0)
+		return;
+
+	while (*in && size_out > 1)
 	{
 		if (*in >= 'A' && *in <= 'Z')
 			*out++ = *in++ + 'a' - 'A';
 		else
 			*out++ = *in++;
+		size_out--;
 	}
+	*out = '\0';
 }
 
-void COM_ToUpperString(const char *in, char *out)
+void COM_ToUpperString (const char *in, char *out, size_t size_out)
 {
-	while (*in)
+	if (size_out == 0)
+		return;
+
+	while (*in && size_out > 1)
 	{
 		if (*in >= 'a' && *in <= 'z')
 			*out++ = *in++ + 'A' - 'a';
 		else
 			*out++ = *in++;
+		size_out--;
 	}
+	*out = '\0';
 }
 
 int COM_StringBeginsWith(const char *s, const char *match)
@@ -875,6 +973,64 @@ 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, const char *commentprefix)
+{
+	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;
+			if (*l == '"')
+			{
+				l++;
+				while (*l && *l != '"')
+				{
+					if (tokenbuf >= tokenbufend)
+						return -1;
+					*tokenbuf++ = *l++;
+				}
+				if (*l == '"')
+					l++;
+			}
+			else
+			{
+				while (*l > ' ')
+				{
+					if (tokenbuf >= tokenbufend)
+						return -1;
+					*tokenbuf++ = *l++;
+				}
+			}
+			if (tokenbuf >= tokenbufend)
+				return -1;
+			*tokenbuf++ = 0;
+		}
+		else
+			l++;
+	}
+	if (*l == '\n')
+		l++;
+	*text = l;
+	return argc;
+}
+
 // written by Elric, thanks Elric!
 char *SearchInfostring(const char *infostring, const char *key)
 {
@@ -898,7 +1054,7 @@ char *SearchInfostring(const char *infostring, const char *key)
 
 			if (c == '\0')
 				return NULL;
-			if (c == '\\')
+			if (c == '\\' || key_ind == sizeof (crt_key) - 1)
 			{
 				crt_key[key_ind] = '\0';
 				break;
@@ -914,7 +1070,7 @@ char *SearchInfostring(const char *infostring, const char *key)
 			{
 				c = *infostring++;
 
-				if (c == '\0' || c == '\\')
+				if (c == '\0' || c == '\\' || value_ind == sizeof (value) - 1)
 				{
 					value[value_ind] = '\0';
 					return value;
@@ -937,3 +1093,86 @@ char *SearchInfostring(const char *infostring, const char *key)
 	}
 }
 
+
+//========================================================
+// strlcat and strlcpy, from OpenBSD
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*	$OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $	*/
+/*	$OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $	*/
+
+
+#ifndef HAVE_STRLCAT
+size_t
+strlcat(char *dst, const char *src, size_t siz)
+{
+	register char *d = dst;
+	register const char *s = src;
+	register size_t n = siz;
+	size_t dlen;
+
+	/* Find the end of dst and adjust bytes left but don't go past end */
+	while (n-- != 0 && *d != '\0')
+		d++;
+	dlen = d - dst;
+	n = siz - dlen;
+
+	if (n == 0)
+		return(dlen + strlen(s));
+	while (*s != '\0') {
+		if (n != 1) {
+			*d++ = *s;
+			n--;
+		}
+		s++;
+	}
+	*d = '\0';
+
+	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)
+{
+	register char *d = dst;
+	register const char *s = src;
+	register size_t n = siz;
+
+	/* Copy as many bytes as will fit */
+	if (n != 0 && --n != 0) {
+		do {
+			if ((*d++ = *s++) == 0)
+				break;
+		} while (--n != 0);
+	}
+
+	/* Not enough room in dst, add NUL and traverse rest of src */
+	if (n == 0) {
+		if (siz != 0)
+			*d = '\0';		/* NUL-terminate dst */
+		while (*s++)
+			;
+	}
+
+	return(s - src - 1);	/* count does not include NUL */
+}
+
+#endif  // #ifndef HAVE_STRLCPY