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

+Tue Mar 20 20:05:33 CET 2007 (tk)

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

+  * freshclam: cleanup some code and fix gcc -W* warnings

+

 Tue Mar 20 19:02:13 CET 2007 (tk)

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

   * freshclam/manager.c: fix log message (bb#411)

@@ -45,7 +45,8 @@

 char *txtquery(const char *domain, unsigned int *ttl)

 {

-	unsigned char answer[PACKETSZ], host[128], *pt, *txt;

+	unsigned char answer[PACKETSZ], host[128], *pt;

+	char *txt;

 	int len, exp, cttl, size, txtlen, type, qtype;

@@ -117,11 +118,11 @@ char *txtquery(const char *domain, unsigned int *ttl)

 	return NULL;

     }

-    if(!(txt = malloc(txtlen + 1)))

+    if(!(txt = (char *) malloc(txtlen + 1)))

 	return NULL;

     pt++;

-    strncpy(txt, pt, txtlen);

+    memcpy(txt, pt, txtlen);

     txt[txtlen] = 0;

     *ttl = cttl;

@@ -151,7 +151,7 @@ static void help(void)

 static int download(const struct cfgstruct *copt, const struct optstruct *opt, const char *datadir)

 {

 	int ret = 0, try = 0, maxattempts = 0;

-	struct cfgstruct *cpt;

+	const struct cfgstruct *cpt;

     maxattempts = cfgopt(copt, "MaxAttempts")->numarg;

@@ -194,7 +194,8 @@ int main(int argc, char **argv)

 	int ret = 52;

 	const char *newdir, *cfgfile;

 	char *pidfile = NULL;

-	struct cfgstruct *copt, *cpt;

+	struct cfgstruct *copt;

+	const struct cfgstruct *cpt;

 #ifndef	C_WINDOWS

 	struct sigaction sigact;

 	struct sigaction oldact;

@@ -271,6 +272,8 @@ int main(int argc, char **argv)

 #ifdef C_WINDOWS

     if(!pthread_win32_process_attach_np()) {

 	mprintf("!Can't start the win32 pthreads layer\n");

+	opt_free(opt);

+	freecfg(copt);

 	return 63;

     }

 #endif

@@ -282,6 +285,7 @@ int main(int argc, char **argv)

 	if(stat(cfgfile, &statbuf) == -1) {

 	    logg("^Can't stat %s (critical error)\n", cfgfile);

 	    opt_free(opt);

+	    freecfg(copt);

 	    return 56;

 	}

@@ -289,6 +293,7 @@ int main(int argc, char **argv)

 	if(statbuf.st_mode & (S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH)) {

 	    logg("^Insecure permissions (for HTTPProxyPassword): %s must have no more than 0700 permissions.\n", cfgfile);

 	    opt_free(opt);

+	    freecfg(copt);

 	    return 56;

 	}

 #endif

@@ -305,6 +310,7 @@ int main(int argc, char **argv)

 	if((user = getpwnam(unpuser)) == NULL) {

 	    logg("^Can't get information about user %s.\n", unpuser);

 	    opt_free(opt);

+	    freecfg(copt);

 	    return 60;

 	}

@@ -313,6 +319,7 @@ int main(int argc, char **argv)

 	    if(initgroups(unpuser, user->pw_gid)) {

 		logg("^initgroups() failed.\n");

 		opt_free(opt);

+		freecfg(copt);

 		return 61;

 	    }

 #endif

@@ -321,6 +328,7 @@ int main(int argc, char **argv)

 	    if(setgroups(1, &user->pw_gid)) {

 		logg("^setgroups() failed.\n");

 		opt_free(opt);

+		freecfg(copt);

 		return 61;

 	    }

 #endif

@@ -329,12 +337,14 @@ int main(int argc, char **argv)

 	if(setgid(user->pw_gid)) {

 	    logg("^setgid(%d) failed.\n", (int) user->pw_gid);

 	    opt_free(opt);

+	    freecfg(copt);

 	    return 61;

 	}

 	if(setuid(user->pw_uid)) {

 	    logg("^setuid(%d) failed.\n", (int) user->pw_uid);

 	    opt_free(opt);

+	    freecfg(copt);

 	    return 61;

 	}

     }

@@ -364,6 +374,7 @@ int main(int argc, char **argv)

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

 	    mprintf("!Problem with internal logger (--log=%s).\n", logg_file);

 	    opt_free(opt);

+	    freecfg(copt);

 	    return 62;

 	}

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

@@ -371,6 +382,7 @@ int main(int argc, char **argv)

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

 	    mprintf("!Problem with internal logger (UpdateLogFile = %s).\n", logg_file);

 	    opt_free(opt);

+	    freecfg(copt);

 	    return 62;

 	}

     } else

@@ -384,6 +396,7 @@ int main(int argc, char **argv)

 	    if((fac = logg_facility(cpt->strarg)) == -1) {

 		mprintf("!LogFacility: %s: No such facility.\n", cpt->strarg);

 		opt_free(opt);

+		freecfg(copt);

 		return 62;

 	    }

 	}

@@ -402,6 +415,7 @@ int main(int argc, char **argv)

     if(chdir(newdir)) {

 	logg("Can't change dir to %s\n", newdir);

 	opt_free(opt);

+	freecfg(copt);

 	return 50;

     } else

 	logg("*Current working dir is %s\n", newdir);

@@ -410,10 +424,14 @@ int main(int argc, char **argv)

     if(opt_check(opt, "list-mirrors")) {

 	if(mirman_read("mirrors.dat", &mdat, 1) == -1) {

 	    printf("Can't read mirrors.dat\n");

+	    opt_free(opt);

+	    freecfg(copt);

 	    return 55;

 	}

 	mirman_list(&mdat);

 	mirman_free(&mdat);

+	opt_free(opt);

+	freecfg(copt);

 	return 0;

     }

@@ -423,6 +441,8 @@ int main(int argc, char **argv)

 	if(WSAStartup(MAKEWORD(2,2), &wsaData) != NO_ERROR) {

 	    logg("!Error at WSAStartup(): %d\n", WSAGetLastError());

+	    opt_free(opt);

+	    freecfg(copt);

 	    return 1;

 	}

     }

@@ -445,6 +465,7 @@ int main(int argc, char **argv)

 	if(checks <= 0) {

 	    logg("^Number of checks must be a positive integer.\n");

 	    opt_free(opt);

+	    freecfg(copt);

 	    return 41;

 	}

@@ -452,6 +473,7 @@ int main(int argc, char **argv)

 	    if(checks > 50) {

 		logg("^Number of checks must be between 1 and 50.\n");

 		opt_free(opt);

+		freecfg(copt);

 		return 41;

 	    }

 	}

@@ -555,6 +577,7 @@ int main(int argc, char **argv)

     }

     opt_free(opt);

+    freecfg(copt);

 #ifdef C_WINDOWS

     WSACleanup();

@@ -187,7 +187,7 @@ static int wwwconnect(const char *server, const char *proxy, int pport, char *ip

     }

     if((host = gethostbyname(hostpt)) == NULL) {

-	char *herr;

+	const char *herr;

 	switch(h_errno) {

 	    case HOST_NOT_FOUND:

 		herr = "Host not found";

@@ -259,10 +259,10 @@ static int wwwconnect(const char *server, const char *proxy, int pport, char *ip

 static int Rfc2822DateTime(char *buf, time_t mtime)

 {

-	struct tm *time;

+	struct tm *gmt;

-    time = gmtime(&mtime);

-    return strftime(buf, 36, "%a, %d %b %Y %X GMT", time);

+    gmt = gmtime(&mtime);

+    return strftime(buf, 36, "%a, %d %b %Y %X GMT", gmt);

 }

 static unsigned int fmt_base64(char *dest, const char *src, unsigned int len)

@@ -668,7 +668,7 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna

     close(fd);

     if(totalsize > 0)

-        logg("Downloading %s [%i%]\n", srcfile, percentage);

+        logg("Downloading %s [%i%%]\n", srcfile, percentage);

     else

         logg("Downloading %s [*]\n", srcfile);

@@ -842,12 +842,12 @@ static struct cl_cvd *currentdb(const char *dbname, unsigned int *inc)

 static int updatedb(const char *dbname, const char *hostname, char *ip, int *signo, const struct cfgstruct *copt, const char *dnsreply, char *localip, int outdated, struct mirdat *mdat)

 {

 	struct cl_cvd *current, *remote;

-	struct cfgstruct *cpt;

+	const struct cfgstruct *cpt;

 	unsigned int nodb = 0, currver = 0, newver = 0, port = 0, i, j;

 	int ret, ims = -1;

 	char *pt, dbfile[32], dbinc[32], *bacinc = NULL;

 	const char *proxy = NULL, *user = NULL, *pass = NULL, *uas = NULL;

-	unsigned int flevel = cl_retflevel(), inc;

+	unsigned int flevel = cl_retflevel(), inc, maxattempts;

 	struct stat sb;

 	int ctimeout, rtimeout;

@@ -1015,8 +1015,9 @@ static int updatedb(const char *dbname, const char *hostname, char *ip, int *sig

 	    }

 	}

+	maxattempts = cfgopt(copt, "MaxAttempts")->numarg;

 	for(i = currver + 1; i <= newver; i++) {

-	    for(j = 0; j < cfgopt(copt, "MaxAttempts")->numarg; j++) {

+	    for(j = 0; j < maxattempts; j++) {

 		ret = getpatch(dbname, i, hostname, ip, localip, proxy, port, user, pass, uas, ctimeout, rtimeout, mdat);

 		if(ret == 52 || ret == 58) {

 		    memset(ip, 0, 16);

@@ -1086,7 +1087,7 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c

 	unsigned int ttl, try = 0;

 	char ipaddr[16], *dnsreply = NULL, *pt, *localip = NULL, *newver = NULL;

 	const char *arg = NULL;

-	struct cfgstruct *cpt;

+	const struct cfgstruct *cpt;

 	struct mirdat mdat;

 #ifdef HAVE_RESOLV_H

 	const char *dnsdbinfo;

@@ -37,8 +37,8 @@

 #include <netdb.h>

 #endif

 #include <sys/types.h>

-/*#include <sys/socket.h>	/* in nonblock.h */

 #ifndef	C_WINDOWS

+#include <sys/socket.h>

 #include <sys/time.h>

 #endif

 #include <time.h>

@@ -87,7 +87,7 @@

 static int connect_error(int sock)

 {

 	int optval;

-	int optlen;

+	socklen_t optlen;

 	optlen = sizeof(optval);

 	getsockopt(sock, SOL_SOCKET, SO_ERROR, &optval, &optlen);

@@ -58,9 +58,10 @@ int notify(const char *cfgfile)

 #endif

         struct sockaddr_in server2;

 	struct hostent *he;

-	struct cfgstruct *copt, *cpt;

+	struct cfgstruct *copt;

+	const struct cfgstruct *cpt;

 	int sockd, bread;

-	char *socktype;

+	const char *socktype;

     if((copt = getcfg(cfgfile, 1)) == NULL) {

@@ -77,6 +78,7 @@ int notify(const char *cfgfile)

 	if((sockd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {

 	    logg("^Clamd was NOT notified: Can't create socket endpoint for %s\n", cpt->strarg);

 	    perror("socket()");

+	    freecfg(copt);

 	    return 1;

 	}

@@ -84,6 +86,7 @@ int notify(const char *cfgfile)

 	    closesocket(sockd);

 	    logg("^Clamd was NOT notified: Can't connect to clamd through %s\n", cpt->strarg);

 	    perror("connect()");

+	    freecfg(copt);

 	    return 1;

 	}

@@ -99,6 +102,7 @@ int notify(const char *cfgfile)

 #endif

 	    logg("^Clamd was NOT notified: Can't create TCP socket\n");

 	    perror("socket()");

+	    freecfg(copt);

 	    return 1;

 	}

@@ -109,6 +113,7 @@ int notify(const char *cfgfile)

 	    if ((he = gethostbyname(cpt->strarg)) == 0) {

 		perror("gethostbyname()");

 		logg("^Clamd was NOT notified: Can't resolve hostname '%s'\n", cpt->strarg);

+		freecfg(copt);

 		return 1;

 	    }

 	    server2.sin_addr = *(struct in_addr *) he->h_addr_list[0];

@@ -121,11 +126,13 @@ int notify(const char *cfgfile)

 	    logg("^Clamd was NOT notified: Can't connect to clamd on %s:%d\n",

 		    inet_ntoa(server2.sin_addr), ntohs(server2.sin_port));

 	    perror("connect()");

+	    freecfg(copt);

 	    return 1;

 	}

     } else {

 	logg("^Clamd was NOT notified: No socket specified in %s\n", cfgfile);

+	freecfg(copt);

 	return 1;

     }

@@ -133,6 +140,7 @@ int notify(const char *cfgfile)

 	logg("^Clamd was NOT notified: Could not write to %s socket\n", socktype);

 	perror("write()");

 	closesocket(sockd);

+	freecfg(copt);

 	return 1;

     }

@@ -142,11 +150,13 @@ int notify(const char *cfgfile)

 	if(!strstr(buff, "RELOADING")) {

 	    logg("^Clamd was NOT notified: Unknown answer from clamd: '%s'\n", buff);

 	    closesocket(sockd);

+	    freecfg(copt);

 	    return 1;

 	}

     closesocket(sockd);

     logg("Clamd successfully notified about the update.\n");

+    freecfg(copt);

     return 0;

 }