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

+Tue Mar  6 15:36:47 CET 2007 (tk)

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

+  * clamd: fix gcc -W* warnings

+

 Tue Mar  6 01:01:32 CET 2007 (tk)

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

   * libclamav: fix some gcc -W* warnings

@@ -84,7 +84,8 @@ static void help(void)

 int main(int argc, char **argv)

 {

-	struct cfgstruct *copt, *cpt;

+	struct cfgstruct *copt;

+	const struct cfgstruct *cpt;

         struct passwd *user;

 	time_t currtime;

 	struct cl_engine *engine = NULL;

@@ -98,7 +98,7 @@ void virusaction(const char *filename, const char *virname, const struct cfgstru

 void virusaction(const char *filename, const char *virname, const struct cfgstruct *copt)

 {

 	pid_t pid;

-	struct cfgstruct *cpt;

+	const struct cfgstruct *cpt;

     if(!(cpt = cfgopt(copt, "VirusEvent"))->enabled)

 	return;

@@ -409,15 +409,16 @@ int scanfd(const int fd, unsigned long int *scanned, const struct cl_engine *eng

 int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *engine, const struct cl_limits *limits, unsigned int options, const struct cfgstruct *copt)

 {

-	int ret, portscan = 1000, sockfd, port = 0, acceptd;

-	int tmpd, bread, retval, timeout, btread, min_port, max_port;

-	long int size = 0, maxsize = 0;

+	int ret, sockfd, acceptd;

+	int tmpd, bread, retval, timeout, btread;

+	unsigned int port = 0, portscan = 1000, min_port, max_port;

+	unsigned long int size = 0, maxsize = 0;

 	short bound = 0, rnd_port_first = 1;

 	const char *virname;

 	char buff[FILEBUFF];

 	struct sockaddr_in server;

 	struct hostent he;

-	struct cfgstruct *cpt;

+	const struct cfgstruct *cpt;

 	char *tmpname;

@@ -477,7 +478,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

 	return -1;

     } else {

 	listen(sockfd, 1);

-	if(mdprintf(odesc, "PORT %d\n", port) <= 0) {

+	if(mdprintf(odesc, "PORT %u\n", port) <= 0) {

 	    logg("!ScanStream: error transmitting port.\n");

 	    close(sockfd);

 	    return -1;

@@ -487,12 +488,12 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

     switch(retval = poll_fd(sockfd, timeout, 0)) {

 	case 0: /* timeout */

 	    mdprintf(odesc, "Accept timeout. ERROR\n");

-	    logg("!ScanStream %d: accept timeout.\n", port);

+	    logg("!ScanStream %u: accept timeout.\n", port);

 	    close(sockfd);

 	    return -1;

 	case -1:

 	    mdprintf(odesc, "Accept poll. ERROR\n");

-	    logg("!ScanStream %d: accept poll failed.\n", port);

+	    logg("!ScanStream %u: accept poll failed.\n", port);

 	    close(sockfd);

 	    return -1;

     }

@@ -500,18 +501,18 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

     if((acceptd = accept(sockfd, NULL, NULL)) == -1) {

 	close(sockfd);

 	mdprintf(odesc, "accept() ERROR\n");

-	logg("!ScanStream %d: accept() failed.\n", port);

+	logg("!ScanStream %u: accept() failed.\n", port);

 	return -1;

     }

-    logg("*Accepted connection on port %d, fd %d\n", port, acceptd);

+    logg("*Accepted connection on port %u, fd %d\n", port, acceptd);

     if ((tmpname = cli_gentempdesc(NULL, &tmpd)) == NULL) {

 	shutdown(sockfd, 2);

 	close(sockfd);

 	close(acceptd);

 	mdprintf(odesc, "tempfile() failed. ERROR\n");

-	logg("!ScanStream %d: Can't create temporary file.\n", port);

+	logg("!ScanStream %u: Can't create temporary file.\n", port);

 	return -1;

     }

@@ -530,7 +531,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

 	    closesocket(sockfd);

 	    closesocket(acceptd);

 	    mdprintf(odesc, "Temporary file -> write ERROR\n");

-	    logg("!ScanStream %d: Can't write to temporary file.\n", port);

+	    logg("!ScanStream %u: Can't write to temporary file.\n", port);

 	    close(tmpd);

 	    if(!cfgopt(copt, "LeaveTemporaryFiles")->enabled)

 		unlink(tmpname);

@@ -542,7 +543,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

 	    btread = (maxsize - size); /* only read up to max */

 	    if(btread <= 0) {

-		logg("^ScanStream %d: Size limit reached (max: %d)\n", port, maxsize);

+		logg("^ScanStream %u: Size limit reached (max: %lu)\n", port, maxsize);

 	    	break; /* Scan what we have */

 	    }

 	}

@@ -551,11 +552,11 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

     switch(retval) {

 	case 0: /* timeout */

 	    mdprintf(odesc, "read timeout ERROR\n");

-	    logg("!ScanStream %d: read timeout.\n", port);

+	    logg("!ScanStream %u: read timeout.\n", port);

 	    break;

 	case -1:

 	    mdprintf(odesc, "read poll ERROR\n");

-	    logg("!ScanStream %d: read poll failed.\n", port);

+	    logg("!ScanStream %u: read poll failed.\n", port);

 	    break;

     }

@@ -575,17 +576,17 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

     if(ret == CL_VIRUS) {

 	mdprintf(odesc, "stream: %s FOUND\n", virname);

-	logg("stream %d: %s FOUND\n", port, virname);

+	logg("stream %u: %s FOUND\n", port, virname);

 	virusaction("stream", virname, copt);

     } else if(ret != CL_CLEAN) {

     	if(retval == 1) {

 	    mdprintf(odesc, "stream: %s ERROR\n", cl_strerror(ret));

-	    logg("stream %d: %s ERROR\n", port, cl_strerror(ret));

+	    logg("stream %u: %s ERROR\n", port, cl_strerror(ret));

 	}

     } else {

 	mdprintf(odesc, "stream: OK\n");

         if(logok)

-	    logg("stream %d: OK\n", port); 

+	    logg("stream %u: OK\n", port); 

     }

     return ret;

@@ -249,7 +249,7 @@ static struct cl_engine *reload_db(struct cl_engine *engine, unsigned int dbopti

 	*ret = 1;

 	return NULL;

     }

-    logg("Database correctly reloaded (%d signatures)\n", sigs);

+    logg("Database correctly reloaded (%u signatures)\n", sigs);

     return engine;

 }

@@ -268,7 +268,7 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

 	sigset_t sigset;

 #endif

 	client_conn_t *client_conn;

-	struct cfgstruct *cpt;

+	const struct cfgstruct *cpt;

 #ifdef HAVE_STRERROR_R

 	char buff[BUFFSIZE + 1];

 #endif

@@ -299,13 +299,13 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

 	if((fd = fopen(cpt->strarg, "w")) == NULL) {

 	    logg("!Can't save PID in file %s\n", cpt->strarg);

 	} else {

-	    fprintf(fd, "%d", (int) mainpid);

+	    fprintf(fd, "%u", (unsigned int) mainpid);

 	    fclose(fd);

 	}

 	umask(old_umask);

     }

-    logg("*Listening daemon: PID: %d\n", getpid());

+    logg("*Listening daemon: PID: %u\n", (unsigned int) mainpid);

     max_threads = cfgopt(copt, "MaxThreads")->numarg;

     if(cfgopt(copt, "ScanArchive")->enabled) {

@@ -314,25 +314,25 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

 	memset(&limits, 0, sizeof(struct cl_limits));

 	if((limits.maxfilesize = cfgopt(copt, "ArchiveMaxFileSize")->numarg)) {

-	    logg("Archive: Archived file size limit set to %d bytes.\n", limits.maxfilesize);

+	    logg("Archive: Archived file size limit set to %lu bytes.\n", limits.maxfilesize);

 	} else {

 	    logg("^Archive: File size limit protection disabled.\n");

 	}

 	if((limits.maxreclevel = cfgopt(copt, "ArchiveMaxRecursion")->numarg)) {

-	    logg("Archive: Recursion level limit set to %d.\n", limits.maxreclevel);

+	    logg("Archive: Recursion level limit set to %u.\n", limits.maxreclevel);

 	} else {

 	    logg("^Archive: Recursion level limit protection disabled.\n");

 	}

 	if((limits.maxfiles = cfgopt(copt, "ArchiveMaxFiles")->numarg)) {

-	    logg("Archive: Files limit set to %d.\n", limits.maxfiles);

+	    logg("Archive: Files limit set to %u.\n", limits.maxfiles);

 	} else {

 	    logg("^Archive: Files limit protection disabled.\n");

 	}

 	if((limits.maxratio = cfgopt(copt, "ArchiveMaxCompressionRatio")->numarg)) {

-	    logg("Archive: Compression ratio limit set to %d.\n", limits.maxratio);

+	    logg("Archive: Compression ratio limit set to %u.\n", limits.maxratio);

 	} else {

 	    logg("^Archive: Compression ratio limit disabled.\n");

 	}

@@ -463,7 +463,7 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

     if(!selfchk) {

 	logg("Self checking disabled.\n");

     } else {

-	logg("Self checking every %d seconds.\n", selfchk);

+	logg("Self checking every %u seconds.\n", selfchk);

     }

     if(cfgopt(copt, "ClamukoScanOnAccess")->enabled)

@@ -56,7 +56,7 @@ int tcpserver(const struct cfgstruct *copt)

 {

 	struct sockaddr_in server;

 	int sockfd, backlog;

-	struct cfgstruct *taddr;

+	const struct cfgstruct *taddr;

 	struct hostent he;

 	char *estr, buf[1024];

 	int true = 1;

@@ -417,7 +417,19 @@ void freecfg(struct cfgstruct *copt)

     return;

 }

-struct cfgstruct *cfgopt(struct cfgstruct *copt, const char *optname)

+const struct cfgstruct *cfgopt(const struct cfgstruct *copt, const char *optname)

+{

+    while(copt) {

+	if(copt->optname && !strcmp(copt->optname, optname))

+	    return copt;

+

+	copt = copt->next;

+    }

+

+    return NULL;

+}

+

+static struct cfgstruct *cfgopt_i(struct cfgstruct *copt, const char *optname)

 {

     while(copt) {

 	if(copt->optname && !strcmp(copt->optname, optname))

@@ -456,7 +468,7 @@ static int regcfg(struct cfgstruct **copt, const char *optname, char *strarg, in

     if(numarg != -1 && numarg != 0)

 	newnode->enabled = 1;

-    if((pt = cfgopt(*copt, optname))) {

+    if((pt = cfgopt_i(*copt, optname))) {

 	if(pt->multiple) {

 	    if(pt->enabled) {

@@ -54,7 +54,7 @@ struct cfgstruct {

 extern struct cfgoption cfg_options[];

 struct cfgstruct *getcfg(const char *cfgfile, int verbose);

-struct cfgstruct *cfgopt(struct cfgstruct *copt, const char *optname);

+const struct cfgstruct *cfgopt(const struct cfgstruct *copt, const char *optname);

 void freecfg(struct cfgstruct *copt);

 #endif

@@ -58,7 +58,8 @@

 char *freshdbdir(void)

 {

 	struct cl_cvd *d1, *d2;

-	struct cfgstruct *copt = NULL, *cpt;

+	struct cfgstruct *copt;

+	const struct cfgstruct *cpt;

 	struct stat foo;

 	const char *dbdir;

 	char *retdir;