X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/22b9fa74de8e80471a5033ea067d3b360930b91d..2eee4b0cd743865445a5023e8c10467cdc9b350e:/lib/log.c

diff --git a/lib/log.c b/lib/log.c
index 7b2ef3d..24f9427 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2005, 2006 Richard Kettlewell
+ * Copyright (C) 2004-2008 Richard Kettlewell
  *
  * 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
@@ -35,11 +35,8 @@
 #define NO_MEMORY_ALLOCATION
 /* because the memory allocation functions report errors */
 
-#include <config.h>
+#include "common.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 #include <syslog.h>
 #include <sys/time.h>
@@ -92,8 +89,10 @@ static void format(char buffer[], size_t bufsize, const char *fmt, va_list ap) {
   int ch;
   size_t n = 0;
   
-  if(byte_vsnprintf(t, sizeof t, fmt, ap) < 0)
-    strcpy(t, "[byte_vsnprintf failed]");
+  if(byte_vsnprintf(t, sizeof t, fmt, ap) < 0) {
+    strcpy(t, "[byte_vsnprintf failed: ");
+    strncat(t, fmt, sizeof t - strlen(t) - 1);
+  }
   p = t;
   while((ch = (unsigned char)*p++)) {
     if(ch >= ' ' && ch <= 126) {