From 304d4258d3a49488f570b8ad71931faa7e5d40ba Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sat, 3 Oct 2009 12:31:59 +0000
Subject: * Merge ioq3-r1498, by popular demand

---
 src/sys/con_tty.c  | 20 ++++++++++++--------
 src/sys/sys_unix.c |  5 ++++-
 2 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'src/sys')

diff --git a/src/sys/con_tty.c b/src/sys/con_tty.c
index 687d1dd4..cdd686a1 100644
--- a/src/sys/con_tty.c
+++ b/src/sys/con_tty.c
@@ -87,12 +87,14 @@ send "\b \b"
 static void CON_Back( void )
 {
 	char key;
+	size_t size;
+
 	key = '\b';
-	write(1, &key, 1);
+	size = write(1, &key, 1);
 	key = ' ';
-	write(1, &key, 1);
+	size = write(1, &key, 1);
 	key = '\b';
-	write(1, &key, 1);
+	size = write(1, &key, 1);
 }
 
 /*
@@ -143,12 +145,13 @@ static void CON_Show( void )
 		ttycon_hide--;
 		if (ttycon_hide == 0)
 		{
-			write( 1, "]", 1 );
+			size_t size;
+			size = write( 1, "]", 1 );
 			if (TTY_con.cursor)
 			{
 				for (i=0; i<TTY_con.cursor; i++)
 				{
-					write(1, TTY_con.buffer+i, 1);
+					size = write(1, TTY_con.buffer+i, 1);
 				}
 			}
 		}
@@ -308,6 +311,7 @@ char *CON_Input( void )
 	int avail;
 	char key;
 	field_t *history;
+	size_t size;
 
 	if( ttycon_on )
 	{
@@ -337,8 +341,8 @@ char *CON_Input( void )
 					strcpy(text, TTY_con.buffer);
 					Field_Clear(&TTY_con);
 					key = '\n';
-					write(1, &key, 1);
-					write( 1, "]", 1 );
+					size = write(1, &key, 1);
+					size = write( 1, "]", 1 );
 					return text;
 				}
 				if (key == '\t')
@@ -400,7 +404,7 @@ char *CON_Input( void )
 			TTY_con.buffer[TTY_con.cursor] = key;
 			TTY_con.cursor++;
 			// print the current line (this is differential)
-			write(1, &key, 1);
+			size = write(1, &key, 1);
 		}
 
 		return NULL;
diff --git a/src/sys/sys_unix.c b/src/sys/sys_unix.c
index 760b6022..b55bbe6d 100644
--- a/src/sys/sys_unix.c
+++ b/src/sys/sys_unix.c
@@ -231,7 +231,10 @@ char *Sys_Cwd( void )
 {
 	static char cwd[MAX_OSPATH];
 
-	getcwd( cwd, sizeof( cwd ) - 1 );
+	char *result = getcwd( cwd, sizeof( cwd ) - 1 );
+	if( result != cwd )
+		return NULL;
+
 	cwd[MAX_OSPATH-1] = 0;
 
 	return cwd;
-- 
cgit