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 52a28285a16dc86924b02d8a5468bf9c4e9f5534..a8016fa7cc371bc2b8ec2a1c4ae5bffe2b39b4b7 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -1,6 +1,10 @@
 
 #include "quakedef.h"
 #include <time.h>
+#ifndef WIN32
+#include <unistd.h>
+#include <fcntl.h>
+#endif
 
 extern cvar_t  timestamps;
 extern cvar_t  timeformat;
@@ -39,81 +43,126 @@ static char qfont_table[256] = {
        'P',  'Q',  'R',  'S',  'T',  'U',  'V',  'W',
        'X',  'Y',  'Z',  '[',  '\\', ']',  '^',  '_',
        '`',  'a',  'b',  'c',  'd',  'e',  'f',  'g',
-       'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o', 
+       'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o',
        'p',  'q',  'r',  's',  't',  'u',  'v',  'w',
        'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<'
 };
 
-#ifdef WIN32
-extern HANDLE hinput, houtput;
-#endif
-
-#define MAX_PRINT_MSG  16384
-void Sys_Printf (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);
-#ifdef HAVE_VSNPRINTF
-       vsnprintf (start, sizeof(start), fmt, argptr);
-#else
-       vsprintf (start, fmt, argptr);
-#endif
-       va_end (argptr);
+void Sys_Print(const char *msg)
+{
+       unsigned char *p;
+       // String we print
+       char final[MAXPRINTMSG];
 
        if (sys_nostdout)
                return;
 
-       if (timestamps.value)
-       {
-               mytime = time (NULL);
-               local = localtime (&mytime);
-               strftime (stamp, sizeof (stamp), timeformat.string, local);
-               
-               snprintf (final, sizeof (final), "%s%s", stamp, start);
-       }
+       if (timestamps.integer)
+               snprintf(final, sizeof(final), "%s%s", Sys_TimeString(timeformat.string), msg);
        else
-               snprintf (final, sizeof (final), "%s", start);
+               strncpy(final, msg, sizeof(final));
 
-       for (p = (unsigned char *) final; *p; p++)
+       // LordHavoc: make sure the string is terminated
+       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);        
+       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);
+}
+
+
+char engineversion[128];
+
+void Sys_Shared_EarlyInit(void)
+{
+       const char* os;
+
+       Memory_Init ();
+
+       COM_InitArgv();
+       COM_InitGameType();
+
+#if defined(__linux__)
+       os = "Linux";
+#elif defined(WIN32)
+       os = "Windows";
+#elif defined(__NetBSD__)
+       os = "NetBSD";
+#elif defined(__OpenBSD__)
+       os = "OpenBSD";
 #else
-       puts(final);
+       os = "Unknown";
 #endif
-//     for (p = (unsigned char *) final; *p; p++)
-//             putc (qfont_table[*p], stdout);
+       snprintf (engineversion, sizeof (engineversion), "%s %s %s", gamename, os, buildstring);
+
+       if (COM_CheckParm("-nostdout"))
+               sys_nostdout = 1;
+       else
+               Con_Printf("%s\n", engineversion);
+}
+
+void Sys_Shared_LateInit(void)
+{
+}
+
+/*
+===============================================================================
+
+DLL MANAGEMENT
+
+===============================================================================
+*/
+
 #ifndef WIN32
-       fflush (stdout);
+#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_Shared_Init(void)
+void Sys_UnloadLibrary (dllhandle_t handle)
 {
-       if (COM_CheckParm("-nostdout"))
-               sys_nostdout = 1;
-       else
-       {
-#if defined(__linux__)
-               fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
-               printf ("DarkPlaces Linux   GL %.2f build %3i", (float) VERSION, buildnumber);
-#elif defined(WIN32)
-               printf ("DarkPlaces Windows GL %.2f build %3i", (float) VERSION, buildnumber);
+#ifdef WIN32
+       FreeLibrary (handle);
 #else
-               printf ("DarkPlaces Unknown GL %.2f build %3i", (float) VERSION, buildnumber);
+       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
+}
+