#include <io.h>
#include "conio.h"
#else
+#include <sys/time.h>
#include <unistd.h>
#include <fcntl.h>
-#include <time.h>
#endif
#include <signal.h>
#include "quakedef.h"
+sys_t sys;
+
// =======================================================================
// General routines
// =======================================================================
void Sys_Shutdown (void)
{
-#ifdef FNDELAY
- fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
-#endif
+ fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NDELAY);
fflush(stdout);
}
char string[MAX_INPUTLINE];
// change stdin to non blocking
-#ifdef FNDELAY
- fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
-#endif
+ fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NDELAY);
va_start (argptr,error);
dpvsnprintf (string, sizeof (string), error, argptr);
va_end (argptr);
- Con_Printf ("Quake Error: %s\n", string);
+ Con_Printf(CON_ERROR "Engine Error: %s\n", string);
Host_Shutdown ();
exit (1);
void Sys_PrintToTerminal(const char *text)
{
-#ifdef FNDELAY
+ if(sys.outfd < 0)
+ return;
// 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);
-#endif
+ // this is because both go to /dev/tty by default!
+ {
+ int origflags = fcntl (sys.outfd, F_GETFL, 0);
+ fcntl (sys.outfd, F_SETFL, origflags & ~O_NDELAY);
#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(sys.outfd, text, (int)strlen(text));
+ if(written <= 0)
+ break; // sorry, I cannot do anything about this error - without an output
+ text += written;
+ }
+ fcntl (sys.outfd, F_SETFL, origflags);
}
-#ifdef FNDELAY
- fcntl (1, F_SETFL, origflags);
-#endif
//fprintf(stdout, "%s", text);
}
int main (int argc, char **argv)
{
signal(SIGFPE, SIG_IGN);
-
- com_argc = argc;
- com_argv = (const char **)argv;
+ sys.selffd = -1;
+ sys.argc = argc;
+ sys.argv = (const char **)argv;
Sys_ProvideSelfFD();
-#ifdef FNDELAY
- fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
-#endif
+ // COMMANDLINEOPTION: sdl: -noterminal disables console output on stdout
+ if(COM_CheckParm("-noterminal"))
+ sys.outfd = -1;
+ // COMMANDLINEOPTION: sdl: -stderr moves console output to stderr
+ else if(COM_CheckParm("-stderr"))
+ sys.outfd = 2;
+ else
+ sys.outfd = 1;
+
+ fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NDELAY);
Host_Main();