added convenience function Sys_TimeString which calls strftime into a temporary buffe...

[xonotic/darkplaces.git] / sys_shared.c

diff --git a/sys_shared.c b/sys_shared.c
index f6f6804f6a158f624902f6ab34fdcf9bd13f4a98..a8016fa7cc371bc2b8ec2a1c4ae5bffe2b39b4b7 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -48,54 +48,48 @@ static char qfont_table[256] = {
        'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<'
 };
 
-#ifdef WIN32
-extern HANDLE hinput, houtput;
-#endif
-
-#define MAX_PRINT_MSG  16384
-void Sys_Printf (const char *fmt, ...)
+static char sys_timestring[128];
+char *Sys_TimeString(const char *timeformat)
 {
-       va_list         argptr;
-       char            start[MAX_PRINT_MSG];   // String we started with
-       char            stamp[MAX_PRINT_MSG];   // Time stamp
-       char            final[MAX_PRINT_MSG];   // String we print
+       time_t mytime = time(NULL);
+       strftime(sys_timestring, sizeof(sys_timestring), timeformat, localtime(&mytime));
+       return sys_timestring;
+}
 
-       time_t          mytime = 0;
-       struct tm       *local = NULL;
 
-       unsigned char           *p;
-#ifdef WIN32
-       DWORD           dummy;
-#endif
+#define MAXPRINTMSG 16384
 
-       va_start (argptr, fmt);
-       vsnprintf (start, sizeof(start), fmt, argptr);
-       va_end (argptr);
+void Sys_Print(const char *msg)
+{
+       unsigned char *p;
+       // String we print
+       char final[MAXPRINTMSG];
 
        if (sys_nostdout)
                return;
 
        if (timestamps.integer)
-       {
-               mytime = time (NULL);
-               local = localtime (&mytime);
-               strftime (stamp, sizeof (stamp), timeformat.string, local);
-
-               snprintf (final, sizeof (final), "%s%s", stamp, start);
-       }
+               snprintf(final, sizeof(final), "%s%s", Sys_TimeString(timeformat.string), msg);
        else
-               snprintf (final, sizeof (final), "%s", start);
+               strncpy(final, msg, sizeof(final));
 
        // LordHavoc: make sure the string is terminated
-       final[MAX_PRINT_MSG - 1] = 0;
+       final[MAXPRINTMSG-1] = 0;
        for (p = (unsigned char *) final;*p; p++)
                *p = qfont_table[*p];
-#ifdef WIN32
-       if (cls.state == ca_dedicated)
-               WriteFile(houtput, final, strlen (final), &dummy, NULL);
-#else
-       printf("%s", final);
-#endif
+       Sys_PrintToTerminal(final);
+}
+
+void Sys_Printf(const char *fmt, ...)
+{
+       va_list argptr;
+       char msg[MAXPRINTMSG];  // String we started with
+
+       va_start(argptr,fmt);
+       vsnprintf(msg,sizeof(msg),fmt,argptr);
+       va_end(argptr);
+
+       Sys_Print(msg);
 }
 
 
@@ -114,6 +108,10 @@ void Sys_Shared_EarlyInit(void)
        os = "Linux";
 #elif defined(WIN32)
        os = "Windows";
+#elif defined(__NetBSD__)
+       os = "NetBSD";
+#elif defined(__OpenBSD__)
+       os = "OpenBSD";
 #else
        os = "Unknown";
 #endif
@@ -129,3 +127,42 @@ void Sys_Shared_LateInit(void)
 {
 }
 
+/*
+===============================================================================
+
+DLL MANAGEMENT
+
+===============================================================================
+*/
+
+#ifndef WIN32
+#include <dlfcn.h>
+#endif
+
+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
+}
+