@@ -1,3 +1,8 @@

+Wed Jun 22 20:12:54 CEST 2005 (tk)

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

+  * clamd/clamd.c, shared/output.c: improve output handling (Patch by Mark

+				Pizzolato <clamav-devel*subscriptions.pizzolato.net>)

+

 Wed Jun 22 17:52:08 CEST 2005 (tk)

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

   * clamd: support operation of both TCP and Unix domain sockets simultaneously

@@ -163,7 +163,7 @@ void clamd(struct optstruct *opt)

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

     logok = cfgopt(copt, "LogClean")->enabled;

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

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

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

     if(cfgopt(copt, "Debug")->enabled) /* enable debug messages in libclamav */

 	cl_debug();

@@ -115,7 +115,7 @@ int main(int argc, char **argv)

     free_opt(opt);

-    logg("*exit main()");

+    mprintf("*exit main()");

     return(0);

 }

@@ -129,10 +129,10 @@ int logg(const char *str, ...)

     va_start(argscpy, str);

     va_start(argsout, str);

-    if(logg_file) {

 #ifdef CL_THREAD_SAFE

-	pthread_mutex_lock(&logg_mutex);

+    pthread_mutex_lock(&logg_mutex);

 #endif

+    if(logg_file) {

 	if(!logg_fd) {

 	    old_umask = umask(0037);

 	    if((logg_fd = fopen(logg_file, "a")) == NULL) {

@@ -200,9 +200,6 @@ int logg(const char *str, ...)

 	fflush(logg_fd);

-#ifdef CL_THREAD_SAFE

-	pthread_mutex_unlock(&logg_mutex);

-#endif

     }

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

@@ -244,6 +241,10 @@ int logg(const char *str, ...)

 	    mprintf(vbuff, str);

     }

+#ifdef CL_THREAD_SAFE

+    pthread_mutex_unlock(&logg_mutex);

+#endif

+

     va_end(args);

     va_end(argscpy);

     va_end(argsout);