X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_shared.c;h=a8016fa7cc371bc2b8ec2a1c4ae5bffe2b39b4b7;hp=0753133c0c6c0b3174f14093d7f312cf30f012c2;hb=ab535393effa9579a6f7bba053e513c0def9113d;hpb=40d4c16ea099f039b3fbe26685673ad478cc5e41

diff --git a/sys_shared.c b/sys_shared.c
index 0753133c..a8016fa7 100644
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -43,84 +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.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);
 }
 
+
 char engineversion[128];
 
 void Sys_Shared_EarlyInit(void)
 {
+	const char* os;
+
+	Memory_Init ();
+
+	COM_InitArgv();
+	COM_InitGameType();
+
 #if defined(__linux__)
-	sprintf (engineversion, "%s Linux %s", gamename, buildstring);
+	os = "Linux";
 #elif defined(WIN32)
-	sprintf (engineversion, "%s Windows %s", gamename, buildstring);
+	os = "Windows";
+#elif defined(__NetBSD__)
+	os = "NetBSD";
+#elif defined(__OpenBSD__)
+	os = "OpenBSD";
 #else
-	sprintf (engineversion, "%s Unknown %s", gamename, buildstring);
+	os = "Unknown";
 #endif
+	snprintf (engineversion, sizeof (engineversion), "%s %s %s", gamename, os, buildstring);
 
 	if (COM_CheckParm("-nostdout"))
 		sys_nostdout = 1;
 	else
-		printf("%s\n", engineversion);
+		Con_Printf("%s\n", engineversion);
 }
 
 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
+}
+