X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Flog.c;h=47464fefbb2bad75908587b880b7c7b00fe3c2c8;hb=3489c6eaceb7ab7f4e8298a2f898dda0c3d0a09c;hp=ab87c32f471922fbc839f013556b030e57bbe01b;hpb=fe507b6b15788a3a8e58063d9dae52532a5229a5;p=yaz-moved-to-github.git

diff --git a/src/log.c b/src/log.c
index ab87c32..47464fe 100644
--- 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.
- *
- * $Id: log.c,v 1.51 2007-05-06 20:12:20 adam Exp $
  */
 
 /**
@@ -175,7 +173,7 @@ static void rotate_log(const char *cur_fname)
         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;
     }
@@ -184,10 +182,13 @@ static void rotate_log(const char *cur_fname)
         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
-            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
@@ -235,7 +236,7 @@ void yaz_log_init_level(int level)
 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;
 }
@@ -243,7 +244,7 @@ void yaz_log_init_prefix(const char *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;
 }
@@ -291,7 +292,7 @@ static void yaz_log_open_check(struct tm *tm, int force, const char *filemode)
     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))
@@ -400,7 +401,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)
                 {
-                    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;
                 }
             }
@@ -439,9 +446,13 @@ void yaz_log(int level, const char *fmt, ...)
 
     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)