added Print versions of Printf functions and made all calls that do not need formatin...

[xonotic/darkplaces.git] / sys_linux.c

diff --git a/sys_linux.c b/sys_linux.c
index 148f540bb91e2f4bc5cf4c02b4f1b0eb028d9790..9e8b155c25317973c075561bd9a98235a8661b73 100644 (file)
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -5,7 +5,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/time.h>
-#include <dlfcn.h>
 #endif
 
 #include <signal.h>
@@ -17,40 +16,6 @@
 cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
 #endif
 
-/*
-===============================================================================
-
-DLL MANAGEMENT
-
-===============================================================================
-*/
-
-dllhandle_t Sys_LoadLibrary (const char* name)
-{
-#ifdef WIN32
-       return LoadLibrary (name);
-#else
-       return dlopen (name, RTLD_LAZY);
-#endif
-}
-
-void Sys_UnloadLibrary (dllhandle_t handle)
-{
-#ifdef WIN32
-       FreeLibrary (handle);
-#else
-       dlclose (handle);
-#endif
-}
-
-void* Sys_GetProcAddress (dllhandle_t handle, const char* name)
-{
-#ifdef WIN32
-       return (void *)GetProcAddress (handle, name);
-#else
-       return (void *)dlsym (handle, name);
-#endif
-}
 
 
 // =======================================================================
@@ -78,13 +43,17 @@ void Sys_Error (const char *error, ...)
 #endif
 
        va_start (argptr,error);
-       vsprintf (string,error,argptr);
+       vsnprintf (string, sizeof (string), error, argptr);
        va_end (argptr);
        fprintf(stderr, "Error: %s\n", string);
 
        Host_Shutdown ();
        exit (1);
+}
 
+void Sys_PrintToTerminal(const char *text)
+{
+       printf("%s", text);
 }
 
 double Sys_DoubleTime (void)
@@ -170,7 +139,7 @@ char *Sys_ConsoleInput(void)
        if (cls.state == ca_dedicated)
        {
                static char text[256];
-               int len;
+               int len = 0;
 #ifdef WIN32
                int c;
 
@@ -225,12 +194,14 @@ char *Sys_ConsoleInput(void)
        return NULL;
 }
 
-void Sys_Sleep(void)
+void Sys_Sleep(int milliseconds)
 {
+       if (milliseconds < 1)
+               milliseconds = 1;
 #ifdef WIN32
-       Sleep (1);
+       Sleep(milliseconds);
 #else
-       usleep(1);
+       usleep(milliseconds * 1000);
 #endif
 }