X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=common.c;h=01609278a47f8ef414966328b4906505719ef877;hb=8a12613ca05c0ceb6420751690abf2563b31f333;hp=7dab60b7760d462f426d3e542177b99c2c566d13;hpb=af0b7a1fa11c2ceedeb9f66ca950f6c0bff8ad8f;p=xonotic%2Fdarkplaces.git

diff --git a/common.c b/common.c
index 7dab60b7..01609278 100644
--- a/common.c
+++ b/common.c
@@ -675,8 +675,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;
@@ -843,28 +843,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 +884,55 @@ 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 argc;
+	char *tokenbufend;
+	const char *l;
+	argc = 0;
+	tokenbufend = tokenbuf + tokenbufsize;
+	l = *text;
+	while (*l && *l != '\n')
+	{
+		if (*l > ' ')
+		{
+			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)
 {