sys_linux, sys_sdl: support options -noterminal and -stderr to define which fd gets...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10990 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/sys_linux.c b/sys_linux.c
index bddb5d7d153a565201bc239178d936d65ef7e14d..0b954301e6c0d92927cfcecad7a17cac0df4f86d 100644 (file)
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -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, 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);
 }
@@ -148,6 +154,15 @@ int main (int argc, char **argv)
        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);
 #endif

diff --git a/sys_sdl.c b/sys_sdl.c
index 833e00d58fd9282ac8a4e150beb902135fcd5665..6175b4f5e31f8bdc7d893fc343339c74664a0fdc 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -52,24 +52,31 @@ void Sys_Error (const char *error, ...)
        exit (1);
 }
 
+static int outfd = 1;
 void Sys_PrintToTerminal(const char *text)
 {
-#ifndef WIN32
+       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);
-#else
+       // 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)
-       {
-               int written = (int)write(1, text, (int)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, strlen(text));
+                       if(written <= 0)
+                               break; // sorry, I cannot do anything about this error - without an output
+                       text += written;
+               }
+#ifdef FNDELAY
+               fcntl (outfd, F_SETFL, origflags);
        }
-#ifndef WIN32
-       fcntl (1, F_SETFL, origflags);
 #endif
        //fprintf(stdout, "%s", text);
 }
@@ -175,6 +182,15 @@ int main (int argc, char *argv[])
        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;
+
 #ifndef WIN32
        fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
 #endif

diff --git a/vid_sdl.c b/vid_sdl.c
index de9e5f9dff3af4e20fba458cd41985c6d0f2c13b..5421f9532d1f3139dc5c0c99bf1d12e7068ff44a 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -2603,7 +2603,7 @@ size_t VID_ListModes(vid_mode_t *modes, size_t maxcount)
        int bpp = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
 
        k = 0;
-       for(vidmodes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE); *vidmodes; ++vidmodes)
+       for(vidmodes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE); vidmodes && *vidmodes; ++vidmodes)
        {
                if(k >= maxcount)
                        break;