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

+Tue Oct 27 23:29:09 CET 2009 (tk)

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

+ * clamdscan: improve error handling (bb#1729)

+

 Tue Oct 27 20:31:36 CET 2009 (tk)

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

  * clamdscan, libclamav, clamdtop, freshclam, sigtool: fix some error path

@@ -257,7 +257,7 @@ int client(const struct optstruct *opts, int *infected)

 	struct stat sb;

 	fstat(0, &sb);

 	if((sb.st_mode & S_IFMT) != S_IFREG) scantype = STREAM;

-	if((sockd = dconnect()) >= 0 && (ret = dsresult(sockd, scantype, NULL, &ret)) >= 0)

+	if((sockd = dconnect()) >= 0 && (ret = dsresult(sockd, scantype, NULL, &ret, NULL, NULL)) >= 0)

 	    *infected = ret;

 	else

 	    errors = 1;

@@ -241,7 +241,7 @@ static int send_fdpass(int sockd, const char *filename) {

 /* Sends a proper scan request to clamd and parses its replies

  * This is used only in non IDSESSION mode

  * Returns the number of infected files or -1 on error */

-int dsresult(int sockd, int scantype, const char *filename, int *printok) {

+int dsresult(int sockd, int scantype, const char *filename, int *printok, int *files, int *errors) {

     int infected = 0, len, beenthere = 0;

     char *bol, *eol;

     struct RCVLN rcv;

@@ -274,12 +274,16 @@ int dsresult(int sockd, int scantype, const char *filename, int *printok) {

     if(len <=0) {

 	*printok = 0;

+	if(errors)

+	    (*errors)++;

 	return len;

     }

     while((len = recvln(&rcv, &bol, &eol))) {

 	if(len == -1) return -1;

 	beenthere = 1;

+	if(files)

+	    (*files)++;

 	if(!filename) logg("~%s\n", bol);

 	if(len > 7) {

 	    char *colon = strrchr(bol, ':');

@@ -301,6 +305,8 @@ int dsresult(int sockd, int scantype, const char *filename, int *printok) {

 		    }

 		}

 	    } else if(!memcmp(eol-7, " ERROR", 6)) {

+		if(errors)

+		    (*errors)++;

 		*printok = 0;

 		if(filename) {

 		    if(scantype >= STREAM)

@@ -369,12 +375,11 @@ static int serial_callback(struct stat *sb, char *filename, const char *path, en

 	if(filename) free(filename);

 	return CL_EOPEN;

     }

-    ret = dsresult(sockd, c->scantype, f, &c->printok);

+    ret = dsresult(sockd, c->scantype, f, &c->printok, &c->files, &c->errors);

     if(filename) free(filename);

     close(sockd);

     if(ret < 0) return CL_EOPEN;

     c->infected += ret;

-    c->files++;

     if(reason == visit_directory_toplev)

 	return CL_BREAK;

     return CL_SUCCESS;

@@ -401,6 +406,8 @@ int serial_client_scan(char *file, int scantype, int *infected, int maxlevel, in

 	if(cdata.printok)

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

 	return 0;

+    } else if(!cdata.files) {

+	logg("~%s: No files scanned\n", file);

     }

     return 1;

 }

@@ -462,6 +469,7 @@ static int dspresult(struct client_parallel_data *c) {

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

 		if(action) action(filename);

 	    } else if(!memcmp(eol-7, " ERROR", 6)) {

+		c->errors++;

 		c->printok = 0;

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

 	    }

@@ -552,6 +560,7 @@ static int parallel_callback(struct stat *sb, char *filename, const char *path,

     }

     if(res <= 0) {

 	c->printok = 0;

+	c->errors++;

 	c->ids = cid->next;

 	c->lastid--;

 	free(cid);

@@ -36,5 +36,5 @@ void recvlninit(struct RCVLN *s, int sockd);

 int recvln(struct RCVLN *s, char **rbol, char **reol);

 int serial_client_scan(char *file, int scantype, int *infected, int maxlevel, int flags);

 int parallel_client_scan(char *file, int scantype, int *infected, int maxlevel, int flags);

-int dsresult(int sockd, int scantype, const char *filename, int *spam);

+int dsresult(int sockd, int scantype, const char *filename, int *printok, int *files, int *errors);

 #endif