--- deliantra/server/common/logger.C	2007/01/15 21:06:18	1.11
+++ deliantra/server/common/logger.C	2007/06/09 23:18:17	1.14
@@ -1,65 +1,62 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Crossfire TRT is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
  * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * 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@schmorp.de>
+ * You should have received a copy of the GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
-#include <stdarg.h>
+#include <cstdarg>
 #include <global.h>
 #include <funcpoint.h>
 
-/*
- * Logs a message to stderr, or to file, and/or even to socket.
- * Or discards the message if it is of no importanse, and none have
- * asked to hear messages of that logLevel.
- *
- * See include/logger.h for possible logLevels.  Messages with llevInfo
- * and llevError are always printed, regardless of debug mode.
- */
-
 void
-LOG (LogLevel logLevel, const char *format, ...)
+LOG (int flags, const char *format, ...)
 {
-  if (logLevel <= settings.debug)
-    {
-      char msec[20];
-      char buf[20460];
-      char tbuf[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));
-
-      va_list ap;
-      va_start (ap, format);
-      vsnprintf (buf, sizeof (buf), format, ap);
-      va_end (ap);
-
-      strncat (tbuf, msec, sizeof (tbuf));
-      strncat (tbuf, buf, sizeof (tbuf));
-
-      fputs (tbuf, logfile);
-      fputs (tbuf, stderr);
-    }
+  int level = flags & 15;
+
+  if (level > settings.debug)
+    return;
+
+  char buf[20480];
+
+  struct timeval tv;
+  gettimeofday (&tv, 0);
+  struct tm *ptime = localtime (&tv.tv_sec);
+
+  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);
+  len += vsnprintf (buf + len, sizeof (buf) - len, format, ap);
+  va_end (ap);
+
+  len = min (sizeof (buf) - 1, len);
+
+  if (buf [len - 1] != '\n')
+    buf [len++] = '\n'; // not 0-terminated
+
+  write (STDERR_FILENO, buf, len);
+  if (logfile != stderr)
+    fwrite (buf, 1, len, logfile);
+
+  if (flags & logBacktrace)
+    log_backtrace (buf);
 }