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

+Tue Oct  7 23:47:02 CEST 2008 (tk)

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

+  * clamdscan: properly handle --infected (bb#1221)

+

 Tue Oct  7 22:35:22 CEST 2008 (tk)

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

   * shared/options.c: handle obsolete options in cmdline parser (bb#1213)

@@ -39,8 +39,7 @@

 void help(void);

-short printinfected = 0;

-

+extern int printinfected;

 extern int notremoved, notmoved;

 static void print_server_version(const struct optstruct *opt)

@@ -71,6 +70,7 @@ int main(int argc, char **argv)

 				  "stdout", "log", "move", "copy", "remove",

 				  "config-file", "no-summary",  "fdpass",

 				  "disable-summary", "multiscan", "reload",

+				  "infected",

 				  NULL };

@@ -58,6 +58,7 @@

 void move_infected(const char *filename, const struct optstruct *opt);

 int notremoved = 0, notmoved = 0;

+int printinfected = 0;

 static int dsresult(int sockd, const struct optstruct *opt)

 {

@@ -135,7 +136,7 @@ static int dsfile(int sockd, const char *scantype, const char *filename, const s

     ret = dsresult(sockd, opt);

-    if(!ret)

+    if(!ret && !printinfected)

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

     return ret;

@@ -448,7 +449,10 @@ int client(const struct optstruct *opt, int *infected)

 			char buff[4096];

 			memset(buff, 0, sizeof(buff));

 			ret = clamd_fdscan(sockd, 0, buff, sizeof(buff));

-			logg("fd: %s%s",buff, ret == 1 ? " FOUND" : ret == -1 ? " ERROR" : "OK");

+			if(ret == 1 || ret == -1)

+			    logg("fd: %s%s\n",buff, ret == 1 ? " FOUND" : " ERROR");

+			else if(!printinfected)

+			    logg("fd: OK\n");

 		}

 #endif

 	} else