X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=common.c;h=8db1f27025ab61c545583f0f2cba1821ab41ff6d;hp=80ca5a377b1bdb5e72d645add42c6c6b489245f9;hb=90ab66ba6bfed05c0ce331d321ff63eba7912637;hpb=e9206d59c8cde436ea29daa46a587db08f73a111

diff --git a/common.c b/common.c
index 80ca5a37..8db1f270 100644
--- a/common.c
+++ b/common.c
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 1996-1997 Id Software, Inc.
-Copyright (C) 2000-2021 DarkPlaces contributors
+Copyright (C) 2000-2020 DarkPlaces contributors
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -1300,148 +1300,6 @@ COM_StringDecolorize(const char *in, size_t size_in, char *out, size_t size_out,
 #undef APPEND
 }
 
-char *InfoString_GetValue(const char *buffer, const char *key, char *value, size_t valuelength)
-{
-	int pos = 0, j;
-	size_t keylength;
-	if (!key)
-		key = "";
-	keylength = strlen(key);
-	if (valuelength < 1 || !value)
-	{
-		Con_Printf("InfoString_GetValue: no room in value\n");
-		return NULL;
-	}
-	value[0] = 0;
-	if (strchr(key, '\\'))
-	{
-		Con_Printf("InfoString_GetValue: key name \"%s\" contains \\ which is not possible in an infostring\n", key);
-		return NULL;
-	}
-	if (strchr(key, '\"'))
-	{
-		Con_Printf("InfoString_SetValue: key name \"%s\" contains \" which is not allowed in an infostring\n", key);
-		return NULL;
-	}
-	if (!key[0])
-	{
-		Con_Printf("InfoString_GetValue: can not look up a key with no name\n");
-		return NULL;
-	}
-	while (buffer[pos] == '\\')
-	{
-		if (!memcmp(buffer + pos+1, key, keylength) &&
-				(buffer[pos+1 + keylength] == 0 ||
-				 buffer[pos+1 + keylength] == '\\'))
-		{
-			pos += 1 + (int)keylength;           // Skip \key
-			if (buffer[pos] == '\\') pos++; // Skip \ before value.
-			for (j = 0;buffer[pos+j] && buffer[pos+j] != '\\' && j < (int)valuelength - 1;j++)
-				value[j] = buffer[pos+j];
-			value[j] = 0;
-			return value;
-		}
-		if (buffer[pos] == '\\') pos++; // Skip \ before value.
-		for (pos++;buffer[pos] && buffer[pos] != '\\';pos++);
-		if (buffer[pos] == '\\') pos++; // Skip \ before value.
-		for (pos++;buffer[pos] && buffer[pos] != '\\';pos++);
-	}
-	// if we reach this point the key was not found
-	return NULL;
-}
-
-void InfoString_SetValue(char *buffer, size_t bufferlength, const char *key, const char *value)
-{
-	int pos = 0, pos2;
-	size_t keylength;
-	if (!key)
-		key = "";
-	if (!value)
-		value = "";
-	keylength = strlen(key);
-	if (strchr(key, '\\') || strchr(value, '\\'))
-	{
-		Con_Printf("InfoString_SetValue: \"%s\" \"%s\" contains \\ which is not possible to store in an infostring\n", key, value);
-		return;
-	}
-	if (strchr(key, '\"') || strchr(value, '\"'))
-	{
-		Con_Printf("InfoString_SetValue: \"%s\" \"%s\" contains \" which is not allowed in an infostring\n", key, value);
-		return;
-	}
-	if (!key[0])
-	{
-		Con_Printf("InfoString_SetValue: can not set a key with no name\n");
-		return;
-	}
-	while (buffer[pos] == '\\')
-	{
-		if (!memcmp(buffer + pos+1, key, keylength) &&
-				(buffer[pos+1 + keylength] == 0 ||
-				 buffer[pos+1 + keylength] == '\\'))
-			break;
-		if (buffer[pos] == '\\') pos++; // Skip \ before value.
-		for (;buffer[pos] && buffer[pos] != '\\';pos++);
-		if (buffer[pos] == '\\') pos++; // Skip \ before value.
-		for (;buffer[pos] && buffer[pos] != '\\';pos++);
-	}
-	// if we found the key, find the end of it because we will be replacing it
-	pos2 = pos;
-	if (buffer[pos] == '\\')
-	{
-		pos2 += 1 + (int)keylength;  // Skip \key
-		if (buffer[pos2] == '\\') pos2++; // Skip \ before value.
-		for (;buffer[pos2] && buffer[pos2] != '\\';pos2++);
-	}
-	if (bufferlength <= pos + 1 + strlen(key) + 1 + strlen(value) + strlen(buffer + pos2))
-	{
-		Con_Printf("InfoString_SetValue: no room for \"%s\" \"%s\" in infostring\n", key, value);
-		return;
-	}
-	if (value[0])
-	{
-		// set the key/value and append the remaining text
-		char tempbuffer[MAX_INPUTLINE];
-		strlcpy(tempbuffer, buffer + pos2, sizeof(tempbuffer));
-		dpsnprintf(buffer + pos, bufferlength - pos, "\\%s\\%s%s", key, value, tempbuffer);
-	}
-	else
-	{
-		// just remove the key from the text
-		strlcpy(buffer + pos, buffer + pos2, bufferlength - pos);
-	}
-}
-
-void InfoString_Print(char *buffer)
-{
-	int i;
-	char key[MAX_INPUTLINE];
-	char value[MAX_INPUTLINE];
-	while (*buffer)
-	{
-		if (*buffer != '\\')
-		{
-			Con_Printf("InfoString_Print: corrupt string\n");
-			return;
-		}
-		for (buffer++, i = 0;*buffer && *buffer != '\\';buffer++)
-			if (i < (int)sizeof(key)-1)
-				key[i++] = *buffer;
-		key[i] = 0;
-		if (*buffer != '\\')
-		{
-			Con_Printf("InfoString_Print: corrupt string\n");
-			return;
-		}
-		for (buffer++, i = 0;*buffer && *buffer != '\\';buffer++)
-			if (i < (int)sizeof(value)-1)
-				value[i++] = *buffer;
-		value[i] = 0;
-		// empty value is an error case
-		Con_Printf("%20s %s\n", key, value[0] ? value : "NO VALUE");
-	}
-}
-
 //========================================================
 // strlcat and strlcpy, from OpenBSD