X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_linux.c;h=ac2ea61636c7087eb6d6c59be09c039bc9eeebba;hp=269d2b9c4e9d4029b1af06ef5f36878e9e30b2d0;hb=46a67647b115154668877ed632b38d95aac7066d;hpb=913039faa5b22651954fe10a148ff1e87e4b84fd

diff --git a/sys_linux.c b/sys_linux.c
index 269d2b9c..ac2ea616 100644
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -1,4 +1,3 @@
-#include "quakedef.h"
 
 #ifdef WIN32
 #include <windows.h>
@@ -13,6 +12,7 @@
 
 #include <signal.h>
 
+#include "quakedef.h"
 
 // =======================================================================
 // General routines
@@ -45,25 +45,31 @@ void Sys_Error (const char *error, ...)
 	exit (1);
 }
 
+static int outfd = 1;
 void Sys_PrintToTerminal(const char *text)
 {
+	if(outfd < 0)
+		return;
 #ifdef FNDELAY
 	// BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
-	int origflags = fcntl (1, F_GETFL, 0);
-	fcntl (1, F_SETFL, origflags & ~FNDELAY);
+	// this is because both go to /dev/tty by default!
+	{
+		int origflags = fcntl (outfd, F_GETFL, 0);
+		fcntl (outfd, F_SETFL, origflags & ~FNDELAY);
 #endif
 #ifdef WIN32
 #define write _write
 #endif
-	while(*text)
-	{
-		fs_offset_t written = (fs_offset_t)write(1, text, strlen(text));
-		if(written <= 0)
-			break; // sorry, I cannot do anything about this error - without an output
-		text += written;
-	}
+		while(*text)
+		{
+			fs_offset_t written = (fs_offset_t)write(outfd, text, (int)strlen(text));
+			if(written <= 0)
+				break; // sorry, I cannot do anything about this error - without an output
+			text += written;
+		}
 #ifdef FNDELAY
-	fcntl (1, F_SETFL, origflags);
+		fcntl (outfd, F_SETFL, origflags);
+	}
 #endif
 	//fprintf(stdout, "%s", text);
 }
@@ -146,6 +152,16 @@ int main (int argc, char **argv)
 
 	com_argc = argc;
 	com_argv = (const char **)argv;
+	Sys_ProvideSelfFD();
+
+	// COMMANDLINEOPTION: sdl: -noterminal disables console output on stdout
+	if(COM_CheckParm("-noterminal"))
+		outfd = -1;
+	// COMMANDLINEOPTION: sdl: -stderr moves console output to stderr
+	else if(COM_CheckParm("-stderr"))
+		outfd = 2;
+	else
+		outfd = 1;
 
 #ifdef FNDELAY
 	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);