chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
restore db4.3 support (broken in previous commit)
[disorder]
/
lib
/
log.c
diff --git
a/lib/log.c
b/lib/log.c
index 7b2ef3d5c608ba3d931527bf8e77103eceafb785..f885e880023e45a694eeabf590b1f16b43c86f4c 100644
(file)
--- a/
lib/log.c
+++ b/
lib/log.c
@@
-1,21
+1,19
@@
/*
* This file is part of DisOrder.
/*
* 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
+ * 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
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation
; either version 2
of the License, or
+ * the Free Software Foundation
, either version 3
of the License, or
* (at your option) any later version.
* (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
+ * G
NU G
eneral Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file lib/log.c @brief Errors and logging
*
*/
/** @file lib/log.c @brief Errors and logging
*
@@
-35,11
+33,8
@@
#define NO_MEMORY_ALLOCATION
/* because the memory allocation functions report errors */
#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>
#include <errno.h>
#include <syslog.h>
#include <sys/time.h>
@@
-92,8
+87,10
@@
static void format(char buffer[], size_t bufsize, const char *fmt, va_list ap) {
int ch;
size_t n = 0;
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) {
p = t;
while((ch = (unsigned char)*p++)) {
if(ch >= ' ' && ch <= 126) {