--- deliantra/server/common/logger.C	2006/08/29 08:01:35	1.3
+++ deliantra/server/common/logger.C	2007/01/07 23:10:42	1.9
@@ -1,11 +1,7 @@
 /*
- * static char *rcsid_loger_c =
- *   "$Id: logger.C,v 1.3 2006/08/29 08:01:35 root Exp $ ";
- */
-
-/*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -23,7 +19,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 
 
@@ -40,43 +36,34 @@
  * and llevError are always printed, regardless of debug mode.
  */
 
-void LOG (LogLevel logLevel, const char *format, ...)
+void
+LOG (LogLevel logLevel, const char *format, ...)
 {
-  char buf[20480];  /* This needs to be really really big - larger
-                     * than any other buffer, since that buffer may
-                     * need to be put in this one.
-                     */
-  char tbuf[20480];
-
-  time_t curtime = time (NULL);
-  struct tm *ptime = localtime (&curtime);
-
-  strftime (tbuf, 256, "%Y-%m-%d %H:%M:%S ", ptime);
-
-  va_list ap;
-  va_start(ap, format);
-
-  buf[0] = '\0';
   if (logLevel <= settings.debug)
-  {
-    vsnprintf(buf, sizeof (buf), format, ap);
-    strncat(tbuf, buf, 20460);
-#ifdef WIN32 /* ---win32 change log handling for win32 */
-        fputs(tbuf, logfile);    /* wrote to file or stdout */
-#ifdef DEBUG				/* if we have a debug version, we want see ALL output */
-                fflush(logfile);    /* so flush this! */
-#endif
-        if(logfile != stderr)   /* if was it a logfile wrote it to screen too */ 
-                fputs(tbuf, stderr); 
-#else
-    fputs(tbuf, logfile);
-#endif
-  }
-  if (!exiting && !trying_emergency_save &&
-      logLevel == llevError && ++nroferrors > MAX_ERRORS) {
-    exiting = 1;
-    if (!trying_emergency_save)
-      emergency_save(0);
-  }
-  va_end(ap);
+    {
+      char buf[20480];              /* This needs to be really really big - larger
+                                     * than any other buffer, since that buffer may
+                                     * need to be put in this one.
+                                     */
+      char msec[20];
+      char tbuf[80];
+
+      struct timeval tv;
+      gettimeofday (&tv, 0);
+      struct tm *ptime = localtime (&tv.tv_sec);
+
+      strftime (tbuf, sizeof (tbuf), "%Y-%m-%d %H:%M:%S", ptime);
+      sprintf (msec, ".%03d ", (int)(tv.tv_usec / 1000));
+
+      va_list ap;
+      va_start (ap, format);
+      vsnprintf (buf, sizeof (buf), format, ap);
+      va_end (ap);
+
+      strncat (tbuf, msec, sizeof (buf));
+      strncat (tbuf, buf, sizeof (buf));
+
+      fputs (tbuf, logfile);
+      fputs (tbuf, stderr);
+    }
 }