X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=common.c;h=8db1f27025ab61c545583f0f2cba1821ab41ff6d;hp=03b7087ef9016182582d45267bbab4abdb3b7471;hb=00b6d96fd1220b1df82036c445389ae19a08709e;hpb=7192176e101b0af7185e7a7477a846c2845946f2

diff --git a/common.c b/common.c
index 03b7087e..8db1f270 100644
--- a/common.c
+++ b/common.c
@@ -1,5 +1,6 @@
 /*
 Copyright (C) 1996-1997 Id Software, Inc.
+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
@@ -28,12 +29,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "utf8lib.h"
 
-cvar_t registered = {CVAR_CLIENT | CVAR_SERVER, "registered","0", "indicates if this is running registered quake (whether gfx/pop.lmp was found)"};
-cvar_t cmdline = {CVAR_CLIENT | CVAR_SERVER, "cmdline","0", "contains commandline the engine was launched with"};
+cvar_t registered = {CF_CLIENT | CF_SERVER, "registered","0", "indicates if this is running registered quake (whether gfx/pop.lmp was found)"};
+cvar_t cmdline = {CF_CLIENT | CF_SERVER, "cmdline","0", "contains commandline the engine was launched with"};
 
 // FIXME: Find a better place for these.
-cvar_t cl_playermodel = {CVAR_CLIENT | CVAR_SERVER | CVAR_USERINFO | CVAR_SAVE, "playermodel", "", "current player model in Nexuiz/Xonotic"};
-cvar_t cl_playerskin = {CVAR_CLIENT | CVAR_SERVER | CVAR_USERINFO | CVAR_SAVE, "playerskin", "", "current player skin in Nexuiz/Xonotic"};
+cvar_t cl_playermodel = {CF_CLIENT | CF_SERVER | CF_USERINFO | CF_ARCHIVE, "playermodel", "", "current player model in Nexuiz/Xonotic"};
+cvar_t cl_playerskin = {CF_CLIENT | CF_SERVER | CF_USERINFO | CF_ARCHIVE, "playerskin", "", "current player skin in Nexuiz/Xonotic"};
 
 char com_token[MAX_INPUTLINE];
 
@@ -180,7 +181,7 @@ int COM_Wordwrap(const char *string, size_t length, float continuationWidth, flo
 	//     If it fits, append it. Continue.
 	//     If it doesn't fit, output current line, advance to next line. Append the word. This is a continuation. Continue.
 
-	qboolean isContinuation = false;
+	qbool isContinuation = false;
 	float spaceWidth;
 	const char *startOfLine = string;
 	const char *cursor = string;
@@ -258,7 +259,7 @@ int COM_Wordwrap(const char *string, size_t length, float continuationWidth, flo
 	return result;
 
 /*
-	qboolean isContinuation = false;
+	qbool isContinuation = false;
 	float currentWordSpace = 0;
 	const char *currentWord = 0;
 	float minReserve = 0;
@@ -457,7 +458,7 @@ COM_ParseToken_Simple
 Parse a token out of a string
 ==============
 */
-int COM_ParseToken_Simple(const char **datapointer, qboolean returnnewline, qboolean parsebackslash, qboolean parsecomments)
+int COM_ParseToken_Simple(const char **datapointer, qbool returnnewline, qbool parsebackslash, qbool parsecomments)
 {
 	int len;
 	int c;
@@ -570,7 +571,7 @@ COM_ParseToken_QuakeC
 Parse a token out of a string
 ==============
 */
-int COM_ParseToken_QuakeC(const char **datapointer, qboolean returnnewline)
+int COM_ParseToken_QuakeC(const char **datapointer, qbool returnnewline)
 {
 	int len;
 	int c;
@@ -684,7 +685,7 @@ COM_ParseToken_VM_Tokenize
 Parse a token out of a string
 ==============
 */
-int COM_ParseToken_VM_Tokenize(const char **datapointer, qboolean returnnewline)
+int COM_ParseToken_VM_Tokenize(const char **datapointer, qbool returnnewline)
 {
 	int len;
 	int c;
@@ -860,30 +861,6 @@ skipwhite:
 	return true;
 }
 
-
-/*
-================
-COM_CheckParm
-
-Returns the position (1 to argc-1) in the program's argument list
-where the given parameter apears, or 0 if not present
-================
-*/
-int COM_CheckParm (const char *parm)
-{
-	int i;
-
-	for (i=1 ; i<sys.argc ; i++)
-	{
-		if (!sys.argv[i])
-			continue;               // NEXTSTEP sometimes clears appkit vars.
-		if (!strcmp (parm,sys.argv[i]))
-			return i;
-	}
-
-	return 0;
-}
-
 /*
 ===============
 Com_CalcRoll
@@ -893,11 +870,11 @@ Used by view and sv_user
 */
 float Com_CalcRoll (const vec3_t angles, const vec3_t velocity, const vec_t angleval, const vec_t velocityval)
 {
-	vec3_t	right;
+	vec3_t	forward, right, up;
 	float	sign;
 	float	side;
 
-	AngleVectors (angles, NULL, right, NULL);
+	AngleVectors (angles, forward, right, up);
 	side = DotProduct (velocity, right);
 	sign = side < 0 ? -1 : 1;
 	side = fabs(side);
@@ -926,9 +903,9 @@ void COM_Init_Commands (void)
 	Cvar_RegisterVariable (&registered);
 	Cvar_RegisterVariable (&cmdline);
 	Cvar_RegisterVariable(&cl_playermodel);
-	Cvar_RegisterAlias(&cl_playermodel, "_cl_playermodel");
+	Cvar_RegisterVirtual(&cl_playermodel, "_cl_playermodel");
 	Cvar_RegisterVariable(&cl_playerskin);
-	Cvar_RegisterAlias(&cl_playerskin, "_cl_playerskin");
+	Cvar_RegisterVirtual(&cl_playerskin, "_cl_playerskin");
 
 	// reconstitute the command line for the cmdline externally visible cvar
 	n = 0;
@@ -1187,7 +1164,7 @@ all characters until the zero terminator.
 ============
 */
 size_t
-COM_StringLengthNoColors(const char *s, size_t size_s, qboolean *valid)
+COM_StringLengthNoColors(const char *s, size_t size_s, qbool *valid)
 {
 	const char *end = size_s ? (s + size_s) : NULL;
 	size_t len = 0;
@@ -1260,8 +1237,8 @@ For size_in, specify the maximum number of characters from in to use, or 0 to us
 all characters until the zero terminator.
 ============
 */
-qboolean
-COM_StringDecolorize(const char *in, size_t size_in, char *out, size_t size_out, qboolean escape_carets)
+qbool
+COM_StringDecolorize(const char *in, size_t size_in, char *out, size_t size_out, qbool escape_carets)
 {
 #define APPEND(ch) do { if(--size_out) { *out++ = (ch); } else { *out++ = 0; return false; } } while(0)
 	const char *end = size_in ? (in + size_in) : NULL;
@@ -1323,153 +1300,11 @@ 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
 
 /*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1998, 2015 Todd C. Miller <millert@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -1484,66 +1319,65 @@ void InfoString_Print(char *buffer)
  * 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 $	*/
+/*	$OpenBSD: strlcat.c,v 1.19 2019/01/25 00:19:25 millert Exp $    */
+/*	$OpenBSD: strlcpy.c,v 1.16 2019/01/25 00:19:25 millert Exp $    */
 
 
 #ifndef HAVE_STRLCAT
 size_t
-strlcat(char *dst, const char *src, size_t siz)
+strlcat(char *dst, const char *src, size_t dsize)
 {
-	register char *d = dst;
-	register const char *s = src;
-	register size_t n = siz;
+	const char *odst = dst;
+	const char *osrc = src;
+	size_t n = dsize;
 	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;
+	/* Find the end of dst and adjust bytes left but don't go past end. */
+	while (n-- != 0 && *dst != '\0')
+		dst++;
+	dlen = dst - odst;
+	n = dsize - dlen;
+
+	if (n-- == 0)
+		return(dlen + strlen(src));
+	while (*src != '\0') {
+		if (n != 0) {
+			*dst++ = *src;
 			n--;
 		}
-		s++;
+		src++;
 	}
-	*d = '\0';
+	*dst = '\0';
 
-	return(dlen + (s - src));	/* count does not include NUL */
+	return(dlen + (src - osrc));	/* count does not include NUL */
 }
 #endif  // #ifndef HAVE_STRLCAT
 
 
 #ifndef HAVE_STRLCPY
 size_t
-strlcpy(char *dst, const char *src, size_t siz)
+strlcpy(char *dst, const char *src, size_t dsize)
 {
-	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)
+	const char *osrc = src;
+	size_t nleft = dsize;
+
+	/* Copy as many bytes as will fit. */
+	if (nleft != 0) {
+		while (--nleft != 0) {
+			if ((*dst++ = *src++) == '\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++)
+	/* Not enough room in dst, add NUL and traverse rest of src. */
+	if (nleft == 0) {
+		if (dsize != 0)
+			*dst = '\0';		/* NUL-terminate dst */
+		while (*src++)
 			;
 	}
 
-	return(s - src - 1);	/* count does not include NUL */
+	return(src - osrc - 1);	/* count does not include NUL */
 }
 
 #endif  // #ifndef HAVE_STRLCPY