@@ -1,3 +1,7 @@

+Mon Oct  8 14:09:05 CEST 2007 (tk)

+----------------------------------

+  * freshclam/freshclam.c: add support for LogFileMaxSize and LogTime

+

 Sat Oct  6 12:36:13 CEST 2007 (acab)

 ------------------------------------

   * libclamav/nsis/nulsft.c: check return value of gentemp()

@@ -16,6 +16,18 @@ Example

 # Default: disabled

 #UpdateLogFile /var/log/freshclam.log

+# Maximum size of the log file.

+# Value of 0 disables the limit.

+# You may use 'M' or 'm' for megabytes (1M = 1m = 1048576 bytes)

+# and 'K' or 'k' for kilobytes (1K = 1k = 1024 bytes).

+# in bytes just don't use modifiers.

+# Default: 1M

+#LogFileMaxSize 2M

+

+# Log time with each message.

+# Default: no

+#LogTime yes

+

 # Enable verbose logging.

 # Default: no

 #LogVerbose yes

@@ -364,9 +364,9 @@ int main(int argc, char **argv)

 	mprintf_stdout = 1;

     /* initialize logger */

-

-    if(cfgopt(copt, "LogVerbose")->enabled)

-	logg_verbose = 1;

+    logg_verbose = cfgopt(copt, "LogVerbose")->enabled;

+    logg_time = cfgopt(copt, "LogTime")->enabled;

+    logg_size = cfgopt(copt, "LogFileMaxSize")->numarg;

     if(opt_check(opt, "log")) {

 	logg_file = opt_arg(opt, "log");

@@ -34,8 +34,8 @@

 struct cfgoption cfg_options[] = {

     {"LogFile",	OPT_QUOTESTR, -1, NULL, 0, OPT_CLAMD},

     {"LogFileUnlock", OPT_BOOL, 0, NULL, 0, OPT_CLAMD},

-    {"LogFileMaxSize", OPT_COMPSIZE, 1048576, NULL, 0, OPT_CLAMD},

-    {"LogTime", OPT_BOOL, 0, NULL, 0, OPT_CLAMD},

+    {"LogFileMaxSize", OPT_COMPSIZE, 1048576, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM},

+    {"LogTime", OPT_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM},

     {"LogClean", OPT_BOOL, 0, NULL, 0, OPT_CLAMD},

     {"LogVerbose", OPT_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM},

     {"LogSyslog", OPT_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM},

@@ -78,7 +78,7 @@ pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;

 FILE *logg_fd = NULL;

 short int logg_verbose = 0, logg_lock = 1, logg_time = 0, logg_foreground = 1;

-int logg_size = 0;

+unsigned int logg_size = 0;

 const char *logg_file = NULL;

 #if defined(USE_SYSLOG) && !defined(C_AIX)

 short logg_syslog;

@@ -176,7 +176,7 @@ int logg(const char *str, ...)

 	    if(stat(logg_file, &sb) != -1) {

 		if(sb.st_size > logg_size) {

 		    logg_file = NULL;

-		    fprintf(logg_fd, "Log size = %d, maximal = %d\n", (int) sb.st_size, logg_size);

+		    fprintf(logg_fd, "Log size = %u, max = %u\n", (unsigned int) sb.st_size, logg_size);

 		    fprintf(logg_fd, "LOGGING DISABLED (Maximal log file size exceeded).\n");

 		    fclose(logg_fd);

 		    logg_fd = NULL;

@@ -36,7 +36,7 @@ int logg(const char *str, ...);

 void logg_close(void);

 extern short int logg_verbose, logg_lock, logg_time;

-extern int logg_size;

+extern unsigned int logg_size;

 extern const char *logg_file;

 #if defined(USE_SYSLOG) && !defined(C_AIX)