@@ -1,7 +1,11 @@

+Sun Jun 12 11:24:59 CEST 2005 (tk)

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

+  * clamscan: improve output handling

+

 Wed Jun  8 16:01:22 CEST 2005 (tk)

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

-  * libclamav/zziplib/zzip-file.c: add method id for AES encrypted archives (thanks to

-    David Majorel <dm*lagoon.nc>). 

+  * libclamav/zziplib/zzip-file.c: add method id for AES encrypted archives

+    (thanks to David Majorel <dm*lagoon.nc>). 

 Wed Jun  8 15:37:34 CEST 2005 (tk)

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

@@ -109,7 +109,7 @@ int clamscan(struct optstruct *opt)

     if(optc(opt, 'l')) {

 	logg_file = getargc(opt, 'l');

-	if(logg("--------------------------------------\n")) {

+	if(logg("#\n-------------------------------------------------------------------------------\n\n")) {

 	    mprintf("!Problem with internal logger.\n");

 	    return 62;

 	}

@@ -293,7 +293,7 @@ int scanmanager(const struct optstruct *opt)

 int scanfile(const char *filename, struct cl_node *root, const struct passwd *user, const struct optstruct *opt, const struct cl_limits *limits, int options)

 {

-	int ret, included;

+	int ret, included, printclean = 1;

 	struct optnode *optnode;

 	char *argument;

 #ifdef C_LINUX

@@ -384,6 +384,7 @@ int scanfile(const char *filename, struct cl_node *root, const struct passwd *us

 	/* in other case try to continue with external archivers */

 	options &= ~CL_SCAN_ARCHIVE; /* and disable decompression for the checkfile() below */

+	printclean = 0;

     }

     if((cli_strbcasestr(filename, ".zip") && optl(opt, "unzip"))

@@ -426,7 +427,7 @@ int scanfile(const char *filename, struct cl_node *root, const struct passwd *us

 	}

     }

-    if((ret = checkfile(filename, root, limits, options, 0)) == CL_VIRUS) {

+    if((ret = checkfile(filename, root, limits, options, printclean)) == CL_VIRUS) {

 	if(optl(opt, "remove")) {

 	    if(unlink(filename)) {

 		logg("%s: Can't remove\n", filename);

@@ -754,7 +755,7 @@ int checkfile(const char *filename, const struct cl_node *root, const struct cl_

     } else if(ret == CL_CLEAN) {

 	if(!printinfected && printclean)

-	    logg("%s: OK\n", filename);

+	    mprintf("%s: OK\n", filename);

     } else

 	if(!printinfected)

 	    logg("%s: %s\n", filename, cl_strerror(ret));

@@ -810,7 +811,7 @@ int checkstdin(const struct cl_node *root, const struct cl_limits *limits, int o

     } else if(ret == CL_CLEAN) {

 	if(!printinfected)

-	    logg("stdin: OK\n");

+	    mprintf("stdin: OK\n");

     } else

 	if(!printinfected)

 	    logg("stdin: %s\n", cl_strerror(ret));

@@ -193,6 +193,8 @@ int logg(const char *str, ...)

 	} else if(*str == '*') {

 	    if(logg_verbose)

 		vfprintf(logg_fd, str + 1, args);

+	} else if(*str == '#') {

+	    vfprintf(logg_fd, str + 1, args);

 	} else vfprintf(logg_fd, str, args);

@@ -227,15 +229,19 @@ int logg(const char *str, ...)

 	    if(logg_verbose) {

 		syslog(LOG_DEBUG, vbuff + 1);

 	    }

+	} else if(vbuff[0] == '#') {

+	    syslog(LOG_INFO, vbuff + 1);

 	} else syslog(LOG_INFO, vbuff);

     }

 #endif

     if(foreground) {

-           _(str);

-           vsnprintf(vbuff, 1024, str, argsout);

-           mprintf(vbuff, str);

+	_(str);

+        vsnprintf(vbuff, 1024, str, argsout);

+	vbuff[1024] = 0;

+	if(vbuff[0] != '#')

+	    mprintf(vbuff, str);

     }

     va_end(args);