Removed all calls to strcpy; most of them are now calls to strlcpy or memcpy.

[xonotic/darkplaces.git] / sys_sdl.c

diff --git a/sys_sdl.c b/sys_sdl.c
index 11d4894dfbb022964e4eb7c376280f127371b41a..702cfaf881a85c7c801c72b22e476723f89af3af 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,5 +1,6 @@
 
 #ifdef WIN32
+#include <io.h>
 #include "conio.h"
 #else
 #include <unistd.h>
@@ -13,10 +14,6 @@
 
 #include <SDL.h>
 
-#ifdef WIN32
-cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
-#endif
-
 // =======================================================================
 // General routines
 // =======================================================================
@@ -29,12 +26,12 @@ void Sys_Shutdown (void)
        fflush(stdout);
        SDL_Quit();
 }
-       
+
 
 void Sys_Error (const char *error, ...)
 {
        va_list argptr;
-       char string[1024];
+       char string[MAX_INPUTLINE];
 
 // change stdin to non blocking
 #ifndef WIN32
@@ -42,13 +39,10 @@ void Sys_Error (const char *error, ...)
 #endif
 
        va_start (argptr,error);
-       vsnprintf (string, sizeof (string), error, argptr);
+       dpvsnprintf (string, sizeof (string), error, argptr);
        va_end (argptr);
-       fprintf(stderr, "Error: %s\n", string);
 
-       Con_Print ("Quake Error: ");
-       Con_Print (string);
-       Con_Print ("\n");
+       Con_Printf ("Quake Error: %s\n", string);
 
        Host_Shutdown ();
        exit (1);
@@ -56,7 +50,22 @@ void Sys_Error (const char *error, ...)
 
 void Sys_PrintToTerminal(const char *text)
 {
-       printf("%s", text);
+#ifndef WIN32
+       // 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
+       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;
+       }
+#ifndef WIN32
+       fcntl (1, F_SETFL, origflags);
+#endif
+       //fprintf(stdout, "%s", text);
 }
 
 double Sys_DoubleTime (void)
@@ -64,35 +73,6 @@ double Sys_DoubleTime (void)
        static int first = true;
        static double oldtime = 0.0, curtime = 0.0;
        double newtime;
-#ifdef WIN32
-       // LordHavoc: note to people modifying this code, DWORD is specifically defined as an unsigned 32bit number, therefore the 65536.0 * 65536.0 is fine.
-       if (!sys_usetimegettime.integer)
-       {
-               // QueryPerformanceCounter
-               // platform:
-               // Windows 95/98/ME/NT/2000/XP
-               // features:
-               // very accurate (CPU cycles)
-               // known issues:
-               // does not necessarily match realtime too well (tends to get faster and faster in win98)
-               // wraps around occasionally on some platforms (depends on CPU speed and probably other unknown factors)
-               double timescale;
-               LARGE_INTEGER PerformanceFreq;
-               LARGE_INTEGER PerformanceCount;
-
-               if (!QueryPerformanceFrequency (&PerformanceFreq))
-                       Sys_Error ("No hardware timer available");
-               QueryPerformanceCounter (&PerformanceCount);
-
-               #ifdef __BORLANDC__
-               timescale = 1.0 / ((double) PerformanceFreq.u.LowPart + (double) PerformanceFreq.u.HighPart * 65536.0 * 65536.0);
-               newtime = ((double) PerformanceCount.u.LowPart + (double) PerformanceCount.u.HighPart * 65536.0 * 65536.0) * timescale;
-               #else
-               timescale = 1.0 / ((double) PerformanceFreq.LowPart + (double) PerformanceFreq.HighPart * 65536.0 * 65536.0);
-               newtime = ((double) PerformanceCount.LowPart + (double) PerformanceCount.HighPart * 65536.0 * 65536.0) * timescale;
-               #endif
-       } else
-#endif
        newtime = (double) SDL_GetTicks() / 1000.0;
 
 
@@ -119,7 +99,7 @@ char *Sys_ConsoleInput(void)
 {
        if (cls.state == ca_dedicated)
        {
-               static char text[256];
+               static char text[MAX_INPUTLINE];
                int len = 0;
 #ifdef WIN32
                int c;
@@ -194,10 +174,12 @@ char *Sys_GetClipboardData (void)
 
                if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
                {
-                       if ((cliptext = GlobalLock (hClipboardData)) != 0) 
+                       if ((cliptext = GlobalLock (hClipboardData)) != 0)
                        {
-                               data = malloc (GlobalSize(hClipboardData)+1);
-                               strcpy (data, cliptext);
+                               size_t allocsize;
+                               allocsize = GlobalSize (hClipboardData) + 1;
+                               data = Z_Malloc (allocsize);
+                               strlcpy (data, cliptext, allocsize);
                                GlobalUnlock (hClipboardData);
                        }
                }
@@ -209,10 +191,16 @@ char *Sys_GetClipboardData (void)
 #endif
 }
 
-int main (int argc, char *argv[])
+void Sys_InitConsole (void)
 {
-       double frameoldtime, framenewtime;
+}
+
+void Sys_Init_Commands (void)
+{
+}
 
+int main (int argc, char *argv[])
+{
        signal(SIGFPE, SIG_IGN);
 
        com_argc = argc;
@@ -222,25 +210,10 @@ int main (int argc, char *argv[])
        fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
 #endif
 
-       Sys_Shared_EarlyInit();
-
-#ifdef WIN32
-       Cvar_RegisterVariable(&sys_usetimegettime);
-#endif
-
-       Host_Init();
+       // we don't know which systems we'll want to init, yet...
+       SDL_Init(0);
 
-       Sys_Shared_LateInit();
+       Host_Main();
 
-       frameoldtime = Sys_DoubleTime () - 0.1;
-       while (1)
-       {
-               // find time spent rendering last frame
-               framenewtime = Sys_DoubleTime ();
-
-               Host_Frame (framenewtime - frameoldtime);
-
-               frameoldtime = framenewtime;
-       }
        return 0;
 }