projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed type to avoid warning
[yaz-moved-to-github.git]
/
src
/
log.c
diff --git
a/src/log.c
b/src/log.c
index
ab87c32
..
e063725
100644
(file)
--- a/
src/log.c
+++ b/
src/log.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: log.c,v 1.51 2007-05-06 20:12:20 adam Exp $
*/
/**
*/
/**
@@
-16,9
+14,12
@@
#ifdef WIN32
#include <windows.h>
#ifdef WIN32
#include <windows.h>
+#include <sys/stat.h>
#endif
#endif
+#if HAVE_SYS_STAT_H
#include <sys/stat.h>
#include <sys/stat.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@
-175,7
+176,7
@@
static void rotate_log(const char *cur_fname)
char fname_str[FILENAME_MAX];
struct stat stat_buf;
char fname_str[FILENAME_MAX];
struct stat stat_buf;
- sprintf(fname_str, "%s.%d", cur_fname, i);
+ yaz_snprintf(fname_str, sizeof(fname_str), "%s.%d", cur_fname, i);
if (stat(fname_str, &stat_buf) != 0)
break;
}
if (stat(fname_str, &stat_buf) != 0)
break;
}
@@
-184,10
+185,13
@@
static void rotate_log(const char *cur_fname)
char fname_str[2][FILENAME_MAX];
if (i > 0)
char fname_str[2][FILENAME_MAX];
if (i > 0)
- sprintf(fname_str[0], "%s.%d", cur_fname, i-1);
+ yaz_snprintf(fname_str[0], sizeof(fname_str[0]),
+ "%s.%d", cur_fname, i-1);
else
else
- sprintf(fname_str[0], "%s", cur_fname);
- sprintf(fname_str[1], "%s.%d", cur_fname, i);
+ yaz_snprintf(fname_str[0], sizeof(fname_str[0]),
+ "%s", cur_fname);
+ yaz_snprintf(fname_str[1], sizeof(fname_str[1]),
+ "%s.%d", cur_fname, i);
#ifdef WIN32
MoveFileEx(fname_str[0], fname_str[1], MOVEFILE_REPLACE_EXISTING);
#else
#ifdef WIN32
MoveFileEx(fname_str[0], fname_str[1], MOVEFILE_REPLACE_EXISTING);
#else
@@
-235,7
+239,7
@@
void yaz_log_init_level(int level)
void yaz_log_init_prefix(const char *prefix)
{
if (prefix && *prefix)
void yaz_log_init_prefix(const char *prefix)
{
if (prefix && *prefix)
- sprintf(l_prefix, "%.511s ", prefix);
+ yaz_snprintf(l_prefix, sizeof(l_prefix), "%s ", prefix);
else
*l_prefix = 0;
}
else
*l_prefix = 0;
}
@@
-243,7
+247,7
@@
void yaz_log_init_prefix(const char *prefix)
void yaz_log_init_prefix2(const char *prefix)
{
if (prefix && *prefix)
void yaz_log_init_prefix2(const char *prefix)
{
if (prefix && *prefix)
- sprintf(l_prefix2, "%.511s ", prefix);
+ yaz_snprintf(l_prefix2, sizeof(l_prefix2), "%s ", prefix);
else
*l_prefix2 = 0;
}
else
*l_prefix2 = 0;
}
@@
-291,7
+295,7
@@
static void yaz_log_open_check(struct tm *tm, int force, const char *filemode)
if (yaz_file_type != use_file)
return;
if (yaz_file_type != use_file)
return;
- if (l_fname && *l_fname)
+ if (*l_fname)
{
strftime(new_filename, sizeof(new_filename)-1, l_fname, tm);
if (strcmp(new_filename, cur_filename))
{
strftime(new_filename, sizeof(new_filename)-1, l_fname, tm);
if (strcmp(new_filename, cur_filename))
@@
-400,7
+404,13
@@
static void yaz_log_to_file(int level, const char *log_message)
if (*mask_names[i].name && mask_names[i].mask &&
mask_names[i].mask != YLOG_ALL)
{
if (*mask_names[i].name && mask_names[i].mask &&
mask_names[i].mask != YLOG_ALL)
{
- sprintf(flags + strlen(flags), "[%s]", mask_names[i].name);
+ if (strlen(flags) + strlen(mask_names[i].name)
+ < sizeof(flags) - 4)
+ {
+ strcat(flags, "[");
+ strcat(flags, mask_names[i].name);
+ strcat(flags, "]");
+ }
level &= ~mask_names[i].mask;
}
}
level &= ~mask_names[i].mask;
}
}
@@
-439,9
+449,13
@@
void yaz_log(int level, const char *fmt, ...)
if (o_level & YLOG_ERRNO)
{
if (o_level & YLOG_ERRNO)
{
- strcat(buf, " [");
- yaz_strerror(buf+strlen(buf), 2048);
- strcat(buf, "]");
+ int remain = sizeof(buf) - strlen(buf);
+ if (remain > 100) /* reasonable minimum space for error */
+ {
+ strcat(buf, " [");
+ yaz_strerror(buf+strlen(buf), remain-5); /* 5 due to extra [] */
+ strcat(buf, "]");
+ }
}
va_end (ap);
if (start_hook_func)
}
va_end (ap);
if (start_hook_func)