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

+Mon Oct  8 15:44:59 CEST 2007 (tk)

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

+  * clamdscan, freshclam: fix some warnings

+

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

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

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

@@ -183,11 +183,6 @@ static int dsfd(int sockfd, int fd, const struct optstruct *opt)

     }

     return dsresult(sockfd, opt);

 }

-#else

-static int dsfd(int sockfd, int fd, const struct optstruct *opt)

-{

-    return -1;

-}

 #endif

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

@@ -195,7 +190,7 @@ static int dsstream(int sockd, const struct optstruct *opt)

 	int wsockd, loopw = 60, bread, port, infected = 0;

 	struct sockaddr_in server;

 	struct sockaddr_in peer;

-	int peer_size;

+	socklen_t peer_size;

 	char buff[4096], *pt;

@@ -206,11 +201,12 @@ static int dsstream(int sockd, const struct optstruct *opt)

     while(loopw) {

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

-	read(sockd, buff, sizeof(buff));

-	if((pt = strstr(buff, "PORT"))) {

-	    pt += 5;

-	    sscanf(pt, "%d", &port);

-	    break;

+	if(read(sockd, buff, sizeof(buff)) > 0) {

+	    if((pt = strstr(buff, "PORT"))) {

+		pt += 5;

+		sscanf(pt, "%d", &port);

+		break;

+	    }

 	}

 	loopw--;

     }

@@ -312,7 +308,8 @@ static int dconnect(const struct optstruct *opt)

 	struct sockaddr_un server;

 	struct sockaddr_in server2;

 	struct hostent *he;

-	struct cfgstruct *copt, *cpt;

+	struct cfgstruct *copt;

+	const struct cfgstruct *cpt;

 	const char *clamav_conf = opt_arg(opt, "config-file");

 	int sockd;

@@ -498,8 +495,9 @@ int client(const struct optstruct *opt, int *infected)

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

 {

-	char *movedir, *movefilename, *tmp, numext[4 + 1];

-	struct stat fstat, mfstat;

+	char *movedir, *movefilename, numext[4 + 1];

+	const char *tmp;

+	struct stat ofstat, mfstat;

 	int n, len, movefilename_size;

 	int moveflag = opt_check(opt, "move");

 	struct utimbuf ubuf;

@@ -519,7 +517,7 @@ void move_infected(const char *filename, const struct optstruct *opt)

         return;

     }

-    if(stat(filename, &fstat) == -1) {

+    if(stat(filename, &ofstat) == -1) {

         logg("^Can't stat file %s\n", filename);

 	logg("Try to run clamdscan with clamd privileges\n");

         notmoved++;

@@ -527,7 +525,7 @@ void move_infected(const char *filename, const struct optstruct *opt)

     }

     if(!(tmp = strrchr(filename, '/')))

-	tmp = (char *) filename;

+	tmp = filename;

     movefilename_size = sizeof(char) * (strlen(movedir) + strlen(tmp) + sizeof(numext) + 2);

@@ -553,7 +551,7 @@ void move_infected(const char *filename, const struct optstruct *opt)

     }

     if(!stat(movefilename, &mfstat)) {

-        if(fstat.st_ino == mfstat.st_ino) { /* It's the same file*/

+        if(ofstat.st_ino == mfstat.st_ino) { /* It's the same file*/

             logg("File excluded '%s'\n", filename);

             notmoved++;

             free(movefilename);

@@ -585,11 +583,12 @@ void move_infected(const char *filename, const struct optstruct *opt)

 	    return;

 	}

-	chmod(movefilename, fstat.st_mode);

-	chown(movefilename, fstat.st_uid, fstat.st_gid);

+	chmod(movefilename, ofstat.st_mode);

+	if(chown(movefilename, ofstat.st_uid, ofstat.st_gid) == -1)

+	    logg("^chown() failed for %s: %s\n", movefilename, strerror(errno));

-	ubuf.actime = fstat.st_atime;

-	ubuf.modtime = fstat.st_mtime;

+	ubuf.actime = ofstat.st_atime;

+	ubuf.modtime = ofstat.st_mtime;

 	utime(movefilename, &ubuf);

 	if(moveflag && unlink(filename)) {

@@ -565,11 +565,14 @@ int main(int argc, char **argv)

     if(opt_check(opt, "on-error-execute")) {

 	if(ret > 1)

-	    system(opt_arg(opt, "on-error-execute"));

+	    if(system(opt_arg(opt, "on-error-execute")) == -1)

+		logg("!system(%s) failed\n", opt_arg(opt, "on-error-execute"));

     } else if((cpt = cfgopt(copt, "OnErrorExecute"))->enabled) {

 	if(ret > 1)

-	    system(cpt->strarg);

+	    if(system(cpt->strarg) == -1)

+		logg("!system(%s) failed\n", cpt->strarg);

+

     }

     if (pidfile) {

         unlink(pidfile);

@@ -1254,8 +1254,8 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c

 	if(arg) {

 	    if(opt_check(opt, "daemon"))

 		execute("OnUpdateExecute", arg);

-            else

-		system(arg);

+            else if(system(arg) == -1)

+		logg("!system(%s) failed\n", arg);

 	}

     }

@@ -1303,8 +1303,8 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c

 	    if(newver) {

 		if(opt_check(opt, "daemon"))

 		    execute("OnOutdatedExecute", cmd);

-		else

-		    system(cmd);

+		else if(system(cmd) == -1)

+		logg("!system(%s) failed\n", cmd);

 	    }

 	    free(cmd);

 	}

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

 	if(logg_size) {

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

-		if(sb.st_size > logg_size) {

+		if((unsigned int) sb.st_size > logg_size) {

 		    logg_file = NULL;

 		    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");