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

+Sat Dec 22 21:52:51 CET 2007 (tk)

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

+  * freshclam: new option CompressLocalDatabase (default: no)

+

 Sat Dec 22 02:07:55 CET 2007 (tk)

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

   * freshclam/manager.c: improve db check; make new db available already

@@ -91,6 +91,11 @@ With this option you can control scripted updates. It's highly recommended to ke

 .br .

 Default: enabled

 .TP 

+\fBCompressLocalDatabase BOOL\fR

+By default freshclam will keep the local databases (.cld) uncompressed to make their handling faster. With this option you can enable the compression; the change will take effect with the next database update.

+.br 

+Default: no

+.TP 

 \fBHTTPProxyServer STR\fR, \fBHTTPProxyPort NUMBER\fR

 Use given proxy server and TCP port for database downloads.

 .TP 

@@ -78,8 +78,15 @@ DatabaseMirror database.clamav.net

 # With this option you can control scripted updates. It's highly recommended

 # to keep it enabled.

+# Default: yes

 #ScriptedUpdates yes

+# By default freshclam will keep the local databases (.cld) uncompressed to

+# make their handling faster. With this option you can enable the compression;

+# the change will take effect with the next database update.

+# Default: no

+#CompressLocalDatabase no

+

 # Number of database checks per day.

 # Default: 12 (every two hours)

 #Checks 24

@@ -51,6 +51,7 @@

 #include <sys/stat.h>

 #include <dirent.h>

 #include <errno.h>

+#include <zlib.h>

 #include "manager.h"

 #include "notify.h"

@@ -820,12 +821,13 @@ static struct cl_cvd *currentdb(const char *dbname, char *localname)

     return cvd;

 }

-static int buildcld(const char *tmpdir, const char *dbname, const char *newfile)

+static int buildcld(const char *tmpdir, const char *dbname, const char *newfile, unsigned int compr)

 {

 	DIR *dir;

 	char cwd[512], info[32], buff[512], *pt;

 	struct dirent *dent;

 	int fd;

+	gzFile *gzs = NULL;

     getcwd(cwd, sizeof(cwd));

@@ -868,15 +870,26 @@ static int buildcld(const char *tmpdir, const char *dbname, const char *newfile)

 	close(fd);

 	return -1;

     }

-    close(fd);

     if((dir = opendir(".")) == NULL) {

 	logg("!buildcld: Can't open directory %s\n", tmpdir);

 	chdir(cwd);

 	unlink(newfile);

+	close(fd);

 	return -1;

     }

+    if(compr) {

+	close(fd);

+	if(!(gzs = gzopen(newfile, "ab"))) {

+	    logg("!buildcld: gzopen() failed for %s\n", newfile);

+	    chdir(cwd);

+	    unlink(newfile);

+	    closedir(dir);

+	    return -1;

+	}

+    }

+

     while((dent = readdir(dir))) {

 #ifndef C_INTERIX

 	if(dent->d_ino)

@@ -885,9 +898,13 @@ static int buildcld(const char *tmpdir, const char *dbname, const char *newfile)

 	    if(!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, ".."))

 		continue;

-	    if(tar_addfile(newfile, dent->d_name) == -1) {

+	    if(tar_addfile(fd, gzs, dent->d_name) == -1) {

 		logg("!buildcld: Can't add %s to .cld file\n", dent->d_name);

 		chdir(cwd);

+		if(gzs)

+		    gzclose(gzs);

+		else

+		    close(fd);

 		unlink(newfile);

 		closedir(dir);

 		return -1;

@@ -896,6 +913,20 @@ static int buildcld(const char *tmpdir, const char *dbname, const char *newfile)

     }

     closedir(dir);

+    if(gzs) {

+	if(gzclose(gzs)) {

+	    logg("!buildcld: gzclose() failed for %s\n", newfile);

+	    unlink(newfile);

+	    return -1;

+	}

+    } else {

+	if(close(fd) == -1) {

+	    logg("!buildcld: close() failed for %s\n", newfile);

+	    unlink(newfile);

+	    return -1;

+	}

+    }

+

     if(chdir(cwd) == -1) {

 	logg("!buildcld: Can't return to previous directory %s\n", cwd);

 	return -1;

@@ -1086,7 +1117,7 @@ static int updatedb(const char *dbname, const char *hostname, char *ip, int *sig

 	    }

 	    snprintf(localname, sizeof(localname), "%s.cvd", dbname);

 	} else {

-	    if(buildcld(tmpdir, dbname, newfile) == -1) {

+	    if(buildcld(tmpdir, dbname, newfile, cfgopt(copt, "CompressLocalDatabase")->enabled) == -1) {

 		logg("!Can't create local database\n");

 		cli_rmdirs(tmpdir);

 		free(tmpdir);

@@ -105,6 +105,7 @@ struct cfgoption cfg_options[] = {

     {"DatabaseMirror", OPT_QUOTESTR, -1, NULL, 1, OPT_FRESHCLAM},

     {"MaxAttempts", OPT_NUM, 3, NULL, 0, OPT_FRESHCLAM},

     {"ScriptedUpdates", OPT_BOOL, 1, NULL, 0, OPT_FRESHCLAM},

+    {"CompressLocalDatabase", OPT_BOOL, 0, NULL, 0, OPT_FRESHCLAM},

     {"HTTPProxyServer", OPT_QUOTESTR, -1, NULL, 0, OPT_FRESHCLAM},

     {"HTTPProxyPort", OPT_NUM, -1, NULL, 0, OPT_FRESHCLAM},

     {"HTTPProxyUsername", OPT_QUOTESTR, -1, NULL, 0, OPT_FRESHCLAM},

@@ -29,6 +29,7 @@

 #ifdef  HAVE_UNISTD_H

 #include <unistd.h>

 #endif

+#include <zlib.h>

 #include "tar.h"

@@ -50,25 +51,21 @@ struct tar_header {

 };

 #define TARBLK 512

-int tar_addfile(const char *tar, const char *file)

+int tar_addfile(int fd, gzFile *gzs, const char *file)

 {

-	int s, d, bytes;

+	int s, bytes;

 	struct tar_header hdr;

 	struct stat sb;

 	unsigned char buff[FILEBUFF], *pt;

 	unsigned int i, chksum = 0;

-    if((d = open(tar, O_WRONLY|O_APPEND|O_CREAT|O_BINARY, 0644)) == -1)

-	return -1;

-

     if((s = open(file, O_RDONLY|O_BINARY)) == -1) {

 	close(s);

 	return -1;

     }

     if(fstat(s, &sb) == -1) {

-	close(d);

 	close(s);

 	return -1;

     }

@@ -81,29 +78,43 @@ int tar_addfile(const char *tar, const char *file)

 	chksum += *pt++;

     snprintf(hdr.chksum, 8, "%06o", chksum + 256);

-    if(write(d, &hdr, TARBLK) != TARBLK) {

-	close(d);

-	close(s);

-	return -1;

+    if(gzs) {

+	if(!gzwrite(gzs, &hdr, TARBLK)) {

+	    close(s);

+	    return -1;

+	}

+    } else {

+	if(write(fd, &hdr, TARBLK) != TARBLK) {

+	    close(s);

+	    return -1;

+	}

     }

     while((bytes = read(s, buff, FILEBUFF)) > 0) {

-	if(write(d, buff, bytes) != bytes) {

-	    close(d);

-	    close(s);

-	    return -1;

+	if(gzs) {

+	    if(!gzwrite(gzs, buff, bytes)) {

+		close(s);

+		return -1;

+	    }

+	} else {

+	    if(write(fd, buff, bytes) != bytes) {

+		close(s);

+		return -1;

+	    }

 	}

     }

+    close(s);

     if(sb.st_size % TARBLK) {

 	memset(&hdr, 0, TARBLK);

-	if(write(d, &hdr, TARBLK - (sb.st_size % TARBLK)) == -1) {

-	    close(d);

-	    close(s);

-	    return -1;

+	if(gzs) {

+	    if(!gzwrite(gzs, &hdr, TARBLK - (sb.st_size % TARBLK)))

+		return -1;

+	} else {

+	    if(write(fd, &hdr, TARBLK - (sb.st_size % TARBLK)) == -1)

+		return -1;

 	}

     }

-    close(s);

-    return close(d);

+    return 0;

 }

@@ -21,6 +21,8 @@

 #ifndef __TAR_H

 #define __TAR_H

-int tar_addfile(const char *tar, const char *file);

+#include <zlib.h>

+

+int tar_addfile(int fd, gzFile *gzs, const char *file);

 #endif