X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=console.c;h=4c99296243d4f6920ea23804d64b8dac44207035;hb=75fa0c6042136f0d314fcddc724d531d0bd454b3;hp=a90439eaa34c6aa26a9f63df0300995fe3eae4ca;hpb=def65da90697b8c8aab723e9042bd18d280ae369;p=xonotic%2Fdarkplaces.git

diff --git a/console.c b/console.c
index a90439ea..4c992962 100644
--- a/console.c
+++ b/console.c
@@ -43,7 +43,15 @@ char con_text[CON_TEXTSIZE];
 
 cvar_t con_notifytime = {CVAR_SAVE, "con_notifytime","3", "how long notify lines last, in seconds"};
 cvar_t con_notify = {CVAR_SAVE, "con_notify","4", "how many notify lines to show (0-32)"};
-cvar_t con_textsize = {CVAR_SAVE, "con_textsize","8", "console text size in virtual 2D pixels"};	//[515]: console text size in pixels
+cvar_t con_textsize = {CVAR_SAVE, "con_textsize","8", "console text size in virtual 2D pixels"};
+
+
+cvar_t sys_specialcharactertranslation = {0, "sys_specialcharactertranslation", "1", "terminal console conchars to ASCII translation (set to 0 if your conchars.tga is for an 8bit character set or if you want raw output)"};
+#ifdef WIN32
+cvar_t sys_colortranslation = {0, "sys_colortranslation", "0", "terminal console color translation (supported values: 0 = strip color codes, 1 = translate to ANSI codes, 2 = no translation)"};
+#else
+cvar_t sys_colortranslation = {0, "sys_colortranslation", "1", "terminal console color translation (supported values: 0 = strip color codes, 1 = translate to ANSI codes, 2 = no translation)"};
+#endif
 
 #define MAX_NOTIFYLINES 32
 // cl.time time the line was generated for transparent notify lines
@@ -68,6 +76,10 @@ LOGGING
 */
 
 cvar_t log_file = {0, "log_file","", "filename to log messages to"};
+cvar_t log_dest_udp = {0, "log_dest_udp","", "UDP address to log messages to (in QW rcon compatible format); multiple destinations can be separated by spaces; DO NOT SPECIFY DNS NAMES HERE"};
+char log_dest_buffer[1400]; // UDP packet
+size_t log_dest_buffer_pos;
+qboolean log_dest_buffer_appending;
 char crt_log_file [MAX_OSPATH] = "";
 qfile_t* logfile = NULL;
 
@@ -77,6 +89,56 @@ size_t logq_size = 0;
 
 void Log_ConPrint (const char *msg);
 
+/*
+====================
+Log_DestBuffer_Init
+====================
+*/
+static void Log_DestBuffer_Init()
+{
+	memcpy(log_dest_buffer, "\377\377\377\377n", 5); // QW rcon print
+	log_dest_buffer_pos = 5;
+}
+
+/*
+====================
+Log_DestBuffer_Flush
+====================
+*/
+void Log_DestBuffer_Flush()
+{
+	lhnetaddress_t log_dest_addr;
+	lhnetsocket_t *log_dest_socket;
+	const char *s = log_dest_udp.string;
+	qboolean have_opened_temp_sockets = false;
+	if(s) if(log_dest_buffer_pos > 5)
+	{
+		++log_dest_buffer_appending;
+		log_dest_buffer[log_dest_buffer_pos++] = 0;
+
+		if(!NetConn_HaveServerPorts() && !NetConn_HaveClientPorts()) // then temporarily open one
+ 		{
+			have_opened_temp_sockets = true;
+			NetConn_OpenServerPorts(true);
+		}
+
+		while(COM_ParseToken_Console(&s))
+			if(LHNETADDRESS_FromString(&log_dest_addr, com_token, 26000))
+			{
+				log_dest_socket = NetConn_ChooseClientSocketForAddress(&log_dest_addr);
+				if(!log_dest_socket)
+					log_dest_socket = NetConn_ChooseServerSocketForAddress(&log_dest_addr);
+				if(log_dest_socket)
+					NetConn_WriteString(log_dest_socket, log_dest_buffer, &log_dest_addr);
+			}
+
+		if(have_opened_temp_sockets)
+			NetConn_CloseServerPorts();
+		--log_dest_buffer_appending;
+	}
+	log_dest_buffer_pos = 0;
+}
+
 /*
 ====================
 Log_Timestamp
@@ -148,6 +210,8 @@ Log_Start
 */
 void Log_Start (void)
 {
+	size_t pos;
+	size_t n;
 	Log_Open ();
 
 	// Dump the contents of the log queue into the log file and free it
@@ -155,8 +219,24 @@ void Log_Start (void)
 	{
 		unsigned char *temp = logqueue;
 		logqueue = NULL;
-		if (logfile != NULL && logq_ind != 0)
-			FS_Write (logfile, temp, logq_ind);
+		if(logq_ind != 0)
+		{
+			if (logfile != NULL)
+				FS_Write (logfile, temp, logq_ind);
+			if(*log_dest_udp.string)
+			{
+				for(pos = 0; pos < logq_ind; )
+				{
+					if(log_dest_buffer_pos == 0)
+						Log_DestBuffer_Init();
+					n = min(sizeof(log_dest_buffer) - log_dest_buffer_pos - 1, logq_ind - pos);
+					memcpy(log_dest_buffer + log_dest_buffer_pos, temp + pos, n);
+					log_dest_buffer_pos += n;
+					Log_DestBuffer_Flush();
+					pos += n;
+				}
+			}
+		}
 		Mem_Free (temp);
 		logq_ind = 0;
 		logq_size = 0;
@@ -215,6 +295,7 @@ void Log_ConPrint (const char *msg)
 	// If a log file is available
 	if (logfile != NULL)
 		FS_Print (logfile, msg);
+
 	inprogress = false;
 }
 
@@ -382,6 +463,47 @@ static void Con_Maps_f (void)
 		GetMapList("", NULL, 0);
 }
 
+void Con_ConDump_f (void)
+{
+	int i, l;
+	qboolean allblankssofar;
+	const char *text;
+	qfile_t *file;
+	char temp[MAX_INPUTLINE+2];
+	if (Cmd_Argc() != 2)
+	{
+		Con_Printf("usage: condump <filename>\n");
+		return;
+	}
+	file = FS_Open(Cmd_Argv(1), "wb", false, false);
+	if (!file)
+	{
+		Con_Printf("condump: unable to write file \"%s\"\n", Cmd_Argv(1));
+		return;
+	}
+	// iterate over the entire console history buffer line by line
+	allblankssofar = true;
+	for (i = 0;i < con_totallines;i++)
+	{
+		text = con_text + ((con_current + 1 + i) % con_totallines)*con_linewidth;
+		// count the used characters on this line
+		for (l = min(con_linewidth, (int)sizeof(temp));l > 0 && text[l-1] == ' ';l--);
+		// if not a blank line, begin output
+		if (l)
+			allblankssofar = false;
+		// output the current line to the file
+		if (!allblankssofar)
+		{
+			if (l)
+				memcpy(temp, text, l);
+			temp[l] = '\n';
+			temp[l+1] = 0;
+			FS_Print(file, temp);
+		}
+	}
+	FS_Close(file);
+}
+
 /*
 ================
 Con_Init
@@ -398,16 +520,17 @@ void Con_Init (void)
 	logqueue = (unsigned char *)Mem_Alloc (tempmempool, logq_size);
 	logq_ind = 0;
 
+	Cvar_RegisterVariable (&sys_colortranslation);
+	Cvar_RegisterVariable (&sys_specialcharactertranslation);
+
 	Cvar_RegisterVariable (&log_file);
+	Cvar_RegisterVariable (&log_dest_udp);
 
 	// support for the classic Quake option
 // COMMANDLINEOPTION: Console: -condebug logs console messages to qconsole.log, see also log_file
 	if (COM_CheckParm ("-condebug") != 0)
 		Cvar_SetQuick (&log_file, "qconsole.log");
-}
 
-void Con_Init_Commands (void)
-{
 	// register our cvars
 	Cvar_RegisterVariable (&con_notifytime);
 	Cvar_RegisterVariable (&con_notify);
@@ -418,7 +541,8 @@ void Con_Init_Commands (void)
 	Cmd_AddCommand ("messagemode", Con_MessageMode_f, "input a chat message to say to everyone");
 	Cmd_AddCommand ("messagemode2", Con_MessageMode2_f, "input a chat message to say to only your team");
 	Cmd_AddCommand ("clear", Con_Clear_f, "clear console history");
-	Cmd_AddCommand ("maps", Con_Maps_f, "list information about available maps");	// By [515]
+	Cmd_AddCommand ("maps", Con_Maps_f, "list information about available maps");
+	Cmd_AddCommand ("condump", Con_ConDump_f, "output console history to a file (see also log_file)");
 
 	con_initialized = true;
 	Con_Print("Console initialized.\n");
@@ -549,6 +673,38 @@ static char qfont_table[256] = {
 	'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<'
 };
 
+/*
+================
+Con_Rcon_AddChar
+
+Adds a character to the rcon buffer
+================
+*/
+void Con_Rcon_AddChar(char c)
+{
+	if(log_dest_buffer_appending)
+		return;
+	++log_dest_buffer_appending;
+
+	// if this print is in response to an rcon command, add the character
+	// to the rcon redirect buffer
+
+	if (rcon_redirect && rcon_redirect_bufferpos < (int)sizeof(rcon_redirect_buffer) - 1)
+		rcon_redirect_buffer[rcon_redirect_bufferpos++] = c;
+	else if(*log_dest_udp.string) // don't duplicate rcon command responses here, these are sent another way
+	{
+		if(log_dest_buffer_pos == 0)
+			Log_DestBuffer_Init();
+		log_dest_buffer[log_dest_buffer_pos++] = c;
+		if(log_dest_buffer_pos >= sizeof(log_dest_buffer) - 1) // minus one, to allow for terminating zero
+			Log_DestBuffer_Flush();
+	}
+	else
+		log_dest_buffer_pos = 0;
+
+	--log_dest_buffer_appending;
+}
+
 /*
 ================
 Con_Print
@@ -561,16 +717,13 @@ extern cvar_t timeformat;
 extern qboolean sys_nostdout;
 void Con_Print(const char *msg)
 {
-	int mask = 0;
+	static int mask = 0;
 	static int index = 0;
 	static char line[MAX_INPUTLINE];
 
 	for (;*msg;msg++)
 	{
-		// if this print is in response to an rcon command, add the character
-		// to the rcon redirect buffer
-		if (rcon_redirect && rcon_redirect_bufferpos < (int)sizeof(rcon_redirect_buffer) - 1)
-			rcon_redirect_buffer[rcon_redirect_bufferpos++] = *msg;
+		Con_Rcon_AddChar(*msg);
 		// if this is the beginning of a new line, print timestamp
 		if (index == 0)
 		{
@@ -579,27 +732,23 @@ void Con_Print(const char *msg)
 			// FIXME: 1. perhaps we should use a terminal system 2. use a constant instead of 7!
 			line[index++] = STRING_COLOR_TAG;
 			// assert( STRING_COLOR_DEFAULT < 10 )
-			line[index++] = STRING_COLOR_DEFAULT_STR;
+			line[index++] = STRING_COLOR_DEFAULT + '0';
 			// special color codes for chat messages must always come first
 			// for Con_PrintToHistory to work properly
-			if (*msg <= 2)
+			if (*msg == 1 || *msg == 2)
 			{
+				// play talk wav
 				if (*msg == 1)
 				{
-					// play talk wav
-					S_LocalSound ("sound/misc/talk.wav");
+					if (msg[1] == '(' && cl.foundtalk2wav)
+						S_LocalSound ("sound/misc/talk2.wav");
+					else
+						S_LocalSound ("sound/misc/talk.wav");
 				}
-				//if (gamemode == GAME_NEXUIZ)
-				//{
-					line[index++] = STRING_COLOR_TAG;
-					line[index++] = '3';
-				//}
-				//else
-				//{
-				//	// go to colored text
-				//	mask = 128;
-				//}
+				line[index++] = STRING_COLOR_TAG;
+				line[index++] = '3';
 				msg++;
+				Con_Rcon_AddChar(*msg);
 			}
 			// store timestamp
 			for (;*timestamp;index++, timestamp++)
@@ -622,9 +771,154 @@ void Con_Print(const char *msg)
 			if (!sys_nostdout)
 			{
 				unsigned char *p;
-				for (p = (unsigned char *) line;*p; p++)
-					*p = qfont_table[*p];
-				Sys_PrintToTerminal(line);
+				if(sys_specialcharactertranslation.integer)
+				{
+					for (p = (unsigned char *) line;*p; p++)
+						*p = qfont_table[*p];
+				}
+
+				if(sys_colortranslation.integer == 1) // ANSI
+				{
+					static char printline[MAX_INPUTLINE * 4 + 3];
+						// 2 can become 7 bytes, rounding that up to 8, and 3 bytes are added at the end
+						// a newline can transform into four bytes, but then prevents the three extra bytes from appearing
+					int lastcolor = 0;
+					const char *in;
+					char *out;
+					for(in = line, out = printline; *in; ++in)
+					{
+						switch(*in)
+						{
+							case STRING_COLOR_TAG:
+								switch(in[1])
+								{
+									case STRING_COLOR_TAG:
+										++in;
+										*out++ = STRING_COLOR_TAG;
+										break;
+									case '0':
+									case '7':
+										// normal color
+										++in;
+										if(lastcolor == 0) break; else lastcolor = 0;
+										*out++ = 0x1B; *out++ = '['; *out++ = 'm';
+										break;
+									case '1':
+										// light red
+										++in;
+										if(lastcolor == 1) break; else lastcolor = 1;
+										*out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '1'; *out++ = 'm';
+										break;
+									case '2':
+										// light green
+										++in;
+										if(lastcolor == 2) break; else lastcolor = 2;
+										*out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '2'; *out++ = 'm';
+										break;
+									case '3':
+										// yellow
+										++in;
+										if(lastcolor == 3) break; else lastcolor = 3;
+										*out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '3'; *out++ = 'm';
+										break;
+									case '4':
+										// light blue
+										++in;
+										if(lastcolor == 4) break; else lastcolor = 4;
+										*out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '4'; *out++ = 'm';
+										break;
+									case '5':
+										// light cyan
+										++in;
+										if(lastcolor == 5) break; else lastcolor = 5;
+										*out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '6'; *out++ = 'm';
+										break;
+									case '6':
+										// light magenta
+										++in;
+										if(lastcolor == 6) break; else lastcolor = 6;
+										*out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '5'; *out++ = 'm';
+										break;
+									// 7 handled above
+									case '8':
+									case '9':
+										// bold normal color
+										++in;
+										if(lastcolor == 8) break; else lastcolor = 8;
+										*out++ = 0x1B; *out++ = '['; *out++ = '0'; *out++ = ';'; *out++ = '1'; *out++ = 'm';
+										break;
+									default:
+										*out++ = STRING_COLOR_TAG;
+										break;
+								}
+								break;
+							case '\n':
+								if(lastcolor != 0)
+								{
+									*out++ = 0x1B; *out++ = '['; *out++ = 'm';
+									lastcolor = 0;
+								}
+								*out++ = *in;
+								break;
+							default:
+								*out++ = *in;
+								break;
+						}
+					}
+					if(lastcolor != 0)
+					{
+						*out++ = 0x1B;
+						*out++ = '[';
+						*out++ = 'm';
+					}
+					*out++ = 0;
+					Sys_PrintToTerminal(printline);
+				}
+				else if(sys_colortranslation.integer == 2) // Quake
+				{
+					Sys_PrintToTerminal(line);
+				}
+				else // strip
+				{
+					static char printline[MAX_INPUTLINE]; // it can only get shorter here
+					const char *in;
+					char *out;
+					for(in = line, out = printline; *in; ++in)
+					{
+						switch(*in)
+						{
+							case STRING_COLOR_TAG:
+								switch(in[1])
+								{
+									case STRING_COLOR_TAG:
+										++in;
+										*out++ = STRING_COLOR_TAG;
+										break;
+									case '0':
+									case '1':
+									case '2':
+									case '3':
+									case '4':
+									case '5':
+									case '6':
+									case '7':
+									case '8':
+									case '9':
+										++in;
+										break;
+									default:
+										*out++ = STRING_COLOR_TAG;
+										break;
+								}
+								break;
+							default:
+								*out++ = *in;
+								break;
+						}
+					}
+					*out++ = 0;
+					Sys_PrintToTerminal(printline);
+				}
 			}
 			// empty the line buffer
 			index = 0;
@@ -715,7 +1009,8 @@ void Con_DrawInput (void)
 	if (!key_consoleactive)
 		return;		// don't draw anything
 
-	text = strcpy(editlinecopy, key_lines[edit_line]);
+	strlcpy(editlinecopy, key_lines[edit_line], sizeof(editlinecopy));
+	text = editlinecopy;
 
 	// Advanced Console Editing by Radix radix@planetquake.com
 	// Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com
@@ -739,7 +1034,7 @@ void Con_DrawInput (void)
 		text += 1 + key_linepos - con_linewidth;
 
 	// draw it
-	DrawQ_ColoredString(0, con_vislines - con_textsize.value*2, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, NULL );
+	DrawQ_String(0, con_vislines - con_textsize.value*2, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, NULL, false );
 
 	// remove cursor
 //	key_lines[edit_line][key_linepos] = 0;
@@ -757,7 +1052,7 @@ void Con_DrawNotify (void)
 {
 	float	x, v;
 	char	*text;
-	int		i;
+	int		i, stop;
 	float	time;
 	char	temptext[MAX_INPUTLINE];
 	int colorindex = -1; //-1 for default
@@ -770,7 +1065,9 @@ void Con_DrawNotify (void)
 		v = 8;
 	else
 		v = 0;
-	for (i= con_current-con_notify.integer+1 ; i<=con_current ; i++)
+	// make a copy of con_current here so that we can't get in a runaway loop printing new messages while drawing the notify text
+	stop = con_current;
+	for (i= stop-con_notify.integer+1 ; i<=stop ; i++)
 	{
 
 		if (i < 0)
@@ -784,14 +1081,29 @@ void Con_DrawNotify (void)
 		text = con_text + (i % con_totallines)*con_linewidth;
 
 		if (gamemode == GAME_NEXUIZ) {
-			int linewidth;
+			int chars = 0;
+			int finalchars = 0;
+			int j;
 
-			for (linewidth = con_linewidth; linewidth && text[linewidth-1] == ' '; linewidth--);
-			x = (vid_conwidth.integer - linewidth * con_textsize.value) * 0.5;
+			// count up to the last non-whitespace, and ignore color codes
+			for (j = 0;j < con_linewidth && text[j];j++)
+			{
+				if (text[j] == STRING_COLOR_TAG && (text[j+1] >= '0' && text[j+1] <= '9'))
+				{
+					j++;
+					continue;
+				}
+				chars++;
+				if (text[j] == ' ')
+					continue;
+				finalchars = chars;
+			}
+			// center the line using the calculated width
+			x = (vid_conwidth.integer - finalchars * con_textsize.value) * 0.5;
 		} else
 			x = 0;
 
-		DrawQ_ColoredString( x, v, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
+		DrawQ_String( x, v, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false );
 
 		v += con_textsize.value;
 	}
@@ -810,13 +1122,13 @@ void Con_DrawNotify (void)
 			sprintf(temptext, "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1));
 		while ((int)strlen(temptext) >= con_linewidth)
 		{
-			DrawQ_ColoredString( 0, v, temptext, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
-			strcpy(temptext, &temptext[con_linewidth]);
+			DrawQ_String( 0, v, temptext, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false );
+			strlcpy(temptext, &temptext[con_linewidth], sizeof(temptext));
 			v += con_textsize.value;
 		}
 		if (strlen(temptext) > 0)
 		{
-			DrawQ_ColoredString( 0, v, temptext, 0, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
+			DrawQ_String( 0, v, temptext, 0, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false );
 			v += con_textsize.value;
 		}
 	}
@@ -832,7 +1144,7 @@ The typing input line at the bottom should only be drawn if typing is allowed
 */
 void Con_DrawConsole (int lines)
 {
-	int i, rows, j;
+	int i, rows, j, stop;
 	float y;
 	char *text;
 	int colorindex = -1;
@@ -841,8 +1153,8 @@ void Con_DrawConsole (int lines)
 		return;
 
 // draw the background
-	DrawQ_Pic(0, lines - vid_conheight.integer, scr_conbrightness.value >= 0.01f ? Draw_CachePic("gfx/conback", false) : NULL, vid_conwidth.integer, vid_conheight.integer, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, scr_conalpha.value, 0);
-	DrawQ_String(vid_conwidth.integer - strlen(engineversion) * con_textsize.value - con_textsize.value, lines - con_textsize.value, engineversion, 0, con_textsize.value, con_textsize.value, 1, 0, 0, 1, 0);
+	DrawQ_Pic(0, lines - vid_conheight.integer, scr_conbrightness.value >= 0.01f ? Draw_CachePic("gfx/conback", true) : NULL, vid_conwidth.integer, vid_conheight.integer, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, scr_conalpha.value, 0);
+	DrawQ_String(vid_conwidth.integer - strlen(engineversion) * con_textsize.value - con_textsize.value, lines - con_textsize.value, engineversion, 0, con_textsize.value, con_textsize.value, 1, 0, 0, 1, 0, NULL, true);
 
 // draw the text
 	con_vislines = lines;
@@ -850,12 +1162,14 @@ void Con_DrawConsole (int lines)
 	rows = (int)ceil((lines/con_textsize.value)-2);		// rows of text to draw
 	y = lines - (rows+2)*con_textsize.value;	// may start slightly negative
 
-	for (i = con_current - rows + 1;i <= con_current;i++, y += con_textsize.value)
+	// make a copy of con_current here so that we can't get in a runaway loop printing new messages while drawing the notify text
+	stop = con_current;
+	for (i = stop - rows + 1;i <= stop;i++, y += con_textsize.value)
 	{
 		j = max(i - con_backscroll, 0);
 		text = con_text + (j % con_totallines)*con_linewidth;
 
-		DrawQ_ColoredString( 0, y, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
+		DrawQ_String( 0, y, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false );
 	}
 
 // draw the input prompt, user text, and cursor if desired
@@ -888,7 +1202,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 		return false;
 	if (t->numfilenames > 1)
 		Con_Printf("^1 %i maps found :\n", t->numfilenames);
-	len = Z_Malloc(t->numfilenames);
+	len = (unsigned char *)Z_Malloc(t->numfilenames);
 	min = 666;
 	for(max=i=0;i<t->numfilenames;i++)
 	{
@@ -909,7 +1223,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 		const char *data = NULL;
 		char keyname[64];
 		char entfilename[MAX_QPATH];
-		strcpy(message, "^1**ERROR**^7");
+		strlcpy(message, "^1**ERROR**^7", sizeof(message));
 		p = 0;
 		f = FS_Open(t->filenames[i], "rb", true, false);
 		if(f)
@@ -951,12 +1265,12 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 			else
 				p = 0;
 			strlcpy(entfilename, t->filenames[i], sizeof(entfilename));
-			strcpy(entfilename + strlen(entfilename) - 4, ".ent");
+			memcpy(entfilename + strlen(entfilename) - 4, ".ent", 5);
 			entities = (char *)FS_LoadFile(entfilename, tempmempool, true, NULL);
 			if (!entities && lumplen >= 10)
 			{
 				FS_Seek(f, lumpofs, SEEK_SET);
-				entities = Z_Malloc(lumplen + 1);
+				entities = (char *)Z_Malloc(lumplen + 1);
 				FS_Read(f, entities, lumplen);
 			}
 			if (entities)
@@ -968,7 +1282,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 				for (;;)
 				{
 					int l;
-					if (!COM_ParseToken(&data, false))
+					if (!COM_ParseToken_Simple(&data, false, false))
 						break;
 					if (com_token[0] == '{')
 						continue;
@@ -979,9 +1293,9 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 					for (l = 0;l < (int)sizeof(keyname) - 1 && com_token[k+l] && com_token[k+l] > ' ';l++)
 						keyname[l] = com_token[k+l];
 					keyname[l] = 0;
-					if (!COM_ParseToken(&data, false))
+					if (!COM_ParseToken_Simple(&data, false, false))
 						break;
-					if (developer.integer >= 2)
+					if (developer.integer >= 100)
 						Con_Printf("key: %s %s\n", keyname, com_token);
 					if (!strcmp(keyname, "message"))
 					{
@@ -999,12 +1313,12 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 		*(t->filenames[i]+len[i]+5) = 0;
 		switch(p)
 		{
-		case Q3BSPVERSION:	strcpy((char *)buf, "Q3");break;
-		case Q2BSPVERSION:	strcpy((char *)buf, "Q2");break;
-		case BSPVERSION:	strcpy((char *)buf, "Q1");break;
-		case MCBSPVERSION:	strcpy((char *)buf, "MC");break;
-		case 30:			strcpy((char *)buf, "HL");break;
-		default:			strcpy((char *)buf, "??");break;
+		case Q3BSPVERSION:	strlcpy((char *)buf, "Q3", sizeof(buf));break;
+		case Q2BSPVERSION:	strlcpy((char *)buf, "Q2", sizeof(buf));break;
+		case BSPVERSION:	strlcpy((char *)buf, "Q1", sizeof(buf));break;
+		case MCBSPVERSION:	strlcpy((char *)buf, "MC", sizeof(buf));break;
+		case 30:			strlcpy((char *)buf, "HL", sizeof(buf));break;
+		default:			strlcpy((char *)buf, "??", sizeof(buf));break;
 		}
 		Con_Printf("%16s (%s) %s\n", t->filenames[i]+5, buf, message);
 	}
@@ -1019,7 +1333,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 				goto endcomplete;
 	}
 endcomplete:
-	if(p > o)
+	if(p > o && completedname && completednamebufferlength > 0)
 	{
 		memset(completedname, 0, completednamebufferlength);
 		memcpy(completedname, (t->filenames[0]+5), min(p, completednamebufferlength - 1));
@@ -1152,7 +1466,7 @@ void Con_CompleteCommandLine (void)
 	if (!(c + v + a))	// No possible matches
 	{
 		if(s2[0])
-			strcpy(&key_lines[edit_line][key_linepos], s2);
+			strlcpy(&key_lines[edit_line][key_linepos], s2, sizeof(key_lines[edit_line]) - key_linepos);
 		return;
 	}