--- deliantra/server/common/logger.C	2007/05/28 21:21:40	1.13
+++ deliantra/server/common/logger.C	2007/06/09 23:18:17	1.14
@@ -34,29 +34,29 @@
   if (level > settings.debug)
     return;
 
-  char msec[20];
-  char buf[20460];
-  char tbuf[20480];
+  char buf[20480];
 
   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));
+  int len = strftime (buf, sizeof (buf) - 7, "%Y-%m-%d %H:%M:%S", ptime);
+  len += sprintf (buf + len, ".%04d ", (int)(tv.tv_usec / 100));
 
   va_list ap;
   va_start (ap, format);
-  vsnprintf (buf, sizeof (buf), format, ap);
+  len += vsnprintf (buf + len, sizeof (buf) - len, format, ap);
   va_end (ap);
 
-  strncat (tbuf, msec, sizeof (tbuf));
-  strncat (tbuf, buf, sizeof (tbuf));
+  len = min (sizeof (buf) - 1, len);
 
-  fputs (tbuf, logfile);
+  if (buf [len - 1] != '\n')
+    buf [len++] = '\n'; // not 0-terminated
+
+  write (STDERR_FILENO, buf, len);
   if (logfile != stderr)
-    fputs (tbuf, stderr);
+    fwrite (buf, 1, len, logfile);
 
   if (flags & logBacktrace)
-    log_backtrace (tbuf);
+    log_backtrace (buf);
 }