@@ -1,3 +1,8 @@

+Tue Dec 18 19:43:04 CET 2007 (tk)

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

+  * libclamav: add (initial) support for direct loading of CVD files (without

+	       extracting to /tmp); requires CL_DB_CVDNOTMP passed to cl_load()

+

 Tue Dec 18 16:25:22 GMT 2007 (njh)

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

   * libclamav/mbox.c:	Fix warnings with various compilers

@@ -69,6 +69,7 @@ extern "C"

 #define CL_DB_ACONLY	    0x4 /* WARNING: only for developers */

 #define CL_DB_PHISHING_URLS 0x8

 #define CL_DB_PUA	    0x10

+#define CL_DB_CVDNOTMP	    0x20

 /* recommended db settings */

 #define CL_DB_STDOPT	    (CL_DB_PHISHING | CL_DB_PHISHING_URLS)

@@ -40,6 +40,7 @@

 #include "dsig.h"

 #include "str.h"

 #include "cvd.h"

+#include "readdb.h"

 #define TAR_BLOCKSIZE 512

@@ -173,6 +174,99 @@ int cli_untgz(int fd, const char *destdir)

     return 0;

 }

+static int cli_tgzload(int fd, struct cl_engine **engine, unsigned int *signo, unsigned int options)

+{

+	char osize[13], name[101];

+	char block[TAR_BLOCKSIZE];

+	int nread, fdd, ret;

+	unsigned int type, size;

+	gzFile *infile;

+	z_off_t off;

+

+

+    cli_dbgmsg("in cli_untgz()\n");

+

+    if((fdd = dup(fd)) == -1) {

+	cli_errmsg("cli_tgzload: Can't duplicate descriptor %d\n", fd);

+	return CL_EIO;

+    }

+

+    if((infile = gzdopen(fdd, "rb")) == NULL) {

+	cli_errmsg("cli_tgzload: Can't gzdopen() descriptor %d, errno = %d\n", fdd, errno);

+	return CL_EIO;

+    }

+

+    while(1) {

+

+	nread = gzread(infile, block, TAR_BLOCKSIZE);

+

+	if(!nread)

+	    break;

+

+	if(nread != TAR_BLOCKSIZE) {

+	    cli_errmsg("cli_tgzload: Incomplete block read\n");

+	    gzclose(infile);

+	    return CL_EMALFDB;

+	}

+

+	if(block[0] == '\0')  /* We're done */

+	    break;

+

+	strncpy(name, block, 100);

+	name[100] = '\0';

+

+	if(strchr(name, '/')) {

+	    cli_errmsg("cli_tgzload: Slash separators are not allowed in CVD\n");

+	    gzclose(infile);

+	    return CL_EMALFDB;

+	}

+

+	type = block[156];

+

+	switch(type) {

+	    case '0':

+	    case '\0':

+		break;

+	    case '5':

+		cli_errmsg("cli_tgzload: Directories are not supported in CVD\n");

+	        gzclose(infile);

+		return CL_EMALFDB;

+	    default:

+		cli_errmsg("cli_tgzload: Unknown type flag '%c'\n", type);

+	        gzclose(infile);

+		return CL_EMALFDB;

+	}

+

+	strncpy(osize, block + 124, 12);

+	osize[12] = '\0';

+

+	if((sscanf(osize, "%o", &size)) == 0) {

+	    cli_errmsg("cli_tgzload: Invalid size in header\n");

+	    gzclose(infile);

+	    return CL_EMALFDB;

+	}

+

+	/* cli_dbgmsg("cli_tgzload: Loading %s, size: %u\n", name, size); */

+	off = gzseek(infile, 0, SEEK_CUR);

+	if(CLI_DBEXT(name)) {

+	    ret = cli_load(name, engine, signo, options, infile, size);

+	    if(ret) {

+		cli_errmsg("cli_tgzload: Invalid size in header\n");

+		gzclose(infile);

+		return CL_EMALFDB;

+	    }

+	}

+	if(off == gzseek(infile, 0, SEEK_CUR))

+	    gzseek(infile, size + TAR_BLOCKSIZE - (size % TAR_BLOCKSIZE), SEEK_CUR);

+	else

+	    gzseek(infile, TAR_BLOCKSIZE - (size % TAR_BLOCKSIZE), SEEK_CUR);

+

+    }

+

+    gzclose(infile);

+    return 0;

+}

+

 struct cl_cvd *cl_cvdparse(const char *head)

 {

 	struct cl_cvd *cvd;

@@ -391,37 +485,42 @@ int cli_cvdload(FILE *fs, struct cl_engine **engine, unsigned int *signo, short

 	cli_warnmsg("***********************************************************\n");

     }

-    dir = cli_gentemp(NULL);

-    if(mkdir(dir, 0700)) {

-	cli_errmsg("cli_cvdload(): Can't create temporary directory %s\n", dir);

-	free(dir);

-	return CL_ETMPDIR;

-    }

-

     cfd = fileno(fs);

-

     /* use only operations on file descriptors, and not on the FILE* from here on 

      * if we seek the FILE*, the underlying descriptor may not seek as expected

      * (for example on OpenBSD, cygwin, etc.).

      * So seek the descriptor directly.

      */ 

-

     if(lseek(cfd, 512, SEEK_SET) == -1) {

 	cli_errmsg("cli_cvdload(): lseek(fs, 512, SEEK_SET) failed\n");

 	return CL_EIO;

     }

-    if(cli_untgz(cfd, dir)) {

-	cli_errmsg("cli_cvdload(): Can't unpack CVD file.\n");

-	free(dir);

-	return CL_ECVDEXTR;

-    }

+    if(options & CL_DB_CVDNOTMP) {

-    /* load extracted directory */

-    ret = cl_load(dir, engine, signo, options);

+	return cli_tgzload(cfd, engine, signo, options);

-    cli_rmdirs(dir);

-    free(dir);

+    } else {

-    return ret;

+	dir = cli_gentemp(NULL);

+	if(mkdir(dir, 0700)) {

+	    cli_errmsg("cli_cvdload(): Can't create temporary directory %s\n", dir);

+	    free(dir);

+	    return CL_ETMPDIR;

+	}

+

+	if(cli_untgz(cfd, dir)) {

+	    cli_errmsg("cli_cvdload(): Can't unpack CVD file.\n");

+	    free(dir);

+	    return CL_ECVDEXTR;

+	}

+

+	/* load extracted directory */

+	ret = cl_load(dir, engine, signo, options);

+

+	cli_rmdirs(dir);

+	free(dir);

+

+	return ret;

+    }

 }

@@ -24,6 +24,7 @@

 #include <string.h>

 #include <stdlib.h>

 #include <ctype.h>

+#include <zlib.h>

 #include "clamav.h"

 #include "cltypes.h"

@@ -259,7 +260,7 @@ static int chkflevel(const char *entry, int field)

     return 1;

 }

-int cli_dconf_load(FILE *fd, struct cl_engine **engine, unsigned int options)

+int cli_dconf_load(FILE *fs, struct cl_engine **engine, unsigned int options, gzFile *gzs, unsigned int gzrsize)

 {

 	char buffer[FILEBUFF];

 	unsigned int line = 0;

@@ -275,7 +276,7 @@ int cli_dconf_load(FILE *fd, struct cl_engine **engine, unsigned int options)

     dconf = (struct cli_dconf *) (*engine)->dconf;

-    while(fgets(buffer, FILEBUFF, fd)) {

+    while(cli_dbgets(buffer, FILEBUFF, fs, gzs, &gzrsize)) {

 	line++;

 	cli_chomp(buffer);

@@ -20,6 +20,7 @@

 #define __DCONF_H

 #include <stdio.h>

+#include <zlib.h>

 #include "clamav.h"

 #include "cltypes.h"

@@ -91,6 +92,5 @@ struct cli_dconf {

 struct cli_dconf *cli_dconf_init(void);

 void cli_dconf_print(struct cli_dconf *dconf);

-int cli_dconf_load(FILE *fd, struct cl_engine **engine, unsigned int options);

-

+int cli_dconf_load(FILE *fs, struct cl_engine **engine, unsigned int options, gzFile *gzs, unsigned int gzrsize);

 #endif

@@ -40,6 +40,7 @@

 #include <sys/param.h>

 #endif

 #include <fcntl.h>

+#include <zlib.h>

 #include "clamav.h"

 #include "cvd.h"

@@ -349,7 +350,28 @@ static int cli_initroots(struct cl_engine *engine, unsigned int options)

     return CL_SUCCESS;

 }

-static int cli_loaddb(FILE *fd, struct cl_engine **engine, unsigned int *signo, unsigned int options)

+char *cli_dbgets(char *buff, unsigned int size, FILE *fs, gzFile *gzs, unsigned int *gzrsize)

+{

+    if(fs) {

+	return fgets(buff, size, fs);

+

+    } else {

+	    char *pt;

+	    unsigned int bs;

+

+	if(!*gzrsize)

+	    return NULL;

+

+	bs = *gzrsize < size ? *gzrsize + 1 : size;

+	pt = gzgets(gzs, buff, bs);

+	*gzrsize -= strlen(buff);

+	if(!pt)

+	    cli_errmsg("cli_dbgets: Preliminary end of data\n");

+	return pt;

+    }

+}

+

+static int cli_loaddb(FILE *fs, struct cl_engine **engine, unsigned int *signo, unsigned int options, gzFile *gzs, unsigned int gzrsize)

 {

 	char buffer[FILEBUFF], *pt, *start;

 	int line = 0, ret = 0;

@@ -368,7 +390,7 @@ static int cli_loaddb(FILE *fd, struct cl_engine **engine, unsigned int *signo,

     root = (*engine)->root[0];

-    while(fgets(buffer, FILEBUFF, fd)) {

+    while(cli_dbgets(buffer, FILEBUFF, fs, gzs, &gzrsize)) {

 	line++;

 	cli_chomp(buffer);

@@ -409,7 +431,7 @@ static int cli_loaddb(FILE *fd, struct cl_engine **engine, unsigned int *signo,

     return CL_SUCCESS;

 }

-static int cli_loadwdb(FILE *fd, struct cl_engine **engine, unsigned int options)

+static int cli_loadwdb(FILE *fs, struct cl_engine **engine, unsigned int options, gzFile *gzs, unsigned int gzrsize)

 {

 	int ret = 0;

@@ -430,7 +452,7 @@ static int cli_loadwdb(FILE *fd, struct cl_engine **engine, unsigned int options

 	}

     }

-    if((ret = load_regex_matcher((*engine)->whitelist_matcher, fd, options, 1))) {

+    if((ret = load_regex_matcher((*engine)->whitelist_matcher, fs, options, 1, gzs, gzrsize))) {

 	phishing_done(*engine);

 	cl_free(*engine);

 	return ret;

@@ -439,7 +461,7 @@ static int cli_loadwdb(FILE *fd, struct cl_engine **engine, unsigned int options

     return CL_SUCCESS;

 }

-static int cli_loadpdb(FILE *fd, struct cl_engine **engine, unsigned int options)

+static int cli_loadpdb(FILE *fs, struct cl_engine **engine, unsigned int options, gzFile *gzs, unsigned int gzrsize)

 {

 	int ret = 0;

@@ -460,7 +482,7 @@ static int cli_loadpdb(FILE *fd, struct cl_engine **engine, unsigned int options

 	}

     }

-    if((ret = load_regex_matcher((*engine)->domainlist_matcher, fd, options, 0))) {

+    if((ret = load_regex_matcher((*engine)->domainlist_matcher, fs, options, 0, gzs, gzrsize))) {

 	phishing_done(*engine);

 	cl_free(*engine);

 	return ret;

@@ -470,7 +492,7 @@ static int cli_loadpdb(FILE *fd, struct cl_engine **engine, unsigned int options

 }

 #define NDB_TOKENS 6

-static int cli_loadndb(FILE *fd, struct cl_engine **engine, unsigned int *signo, unsigned short sdb, unsigned int options)

+static int cli_loadndb(FILE *fs, struct cl_engine **engine, unsigned int *signo, unsigned short sdb, unsigned int options, gzFile *gzs, unsigned int gzrsize)

 {

 	const char *tokens[NDB_TOKENS];

 	char buffer[FILEBUFF];

@@ -491,7 +513,7 @@ static int cli_loadndb(FILE *fd, struct cl_engine **engine, unsigned int *signo,

 	return ret;

     }

-    while(fgets(buffer, FILEBUFF, fd)) {

+    while(cli_dbgets(buffer, FILEBUFF, fs, gzs, &gzrsize)) {

 	line++;

 	if(!strncmp(buffer, "Exploit.JPEG.Comment", 20)) /* temporary */

@@ -596,7 +618,7 @@ static int cli_loadndb(FILE *fd, struct cl_engine **engine, unsigned int *signo,

 }

 #define FT_TOKENS 4

-static int cli_loadft(FILE *fd, struct cl_engine **engine, unsigned int options, unsigned int internal)

+static int cli_loadft(FILE *fs, struct cl_engine **engine, unsigned int options, unsigned int internal, gzFile *gzs, unsigned int gzrsize)

 {

 	const char *tokens[FT_TOKENS];

 	char buffer[FILEBUFF];

@@ -622,7 +644,7 @@ static int cli_loadft(FILE *fd, struct cl_engine **engine, unsigned int options,

 		break;

 	    strncpy(buffer, ftypes_int[line], sizeof(buffer));

 	} else {

-	    if(!fgets(buffer, FILEBUFF, fd))

+	    if(!cli_dbgets(buffer, FILEBUFF, fs, gzs, &gzrsize))

 		break;

 	    cli_chomp(buffer);

 	}

@@ -730,7 +752,7 @@ static int cli_md5db_init(struct cl_engine **engine, unsigned int mode)

     else			    \

 	db = (*engine)->md5_fp;

-static int cli_loadmd5(FILE *fd, struct cl_engine **engine, unsigned int *signo, unsigned int mode, unsigned int options)

+static int cli_loadmd5(FILE *fs, struct cl_engine **engine, unsigned int *signo, unsigned int mode, unsigned int options, gzFile *gzs, unsigned int gzrsize)

 {

 	char buffer[FILEBUFF], *pt;

 	int ret = CL_SUCCESS;

@@ -750,7 +772,7 @@ static int cli_loadmd5(FILE *fd, struct cl_engine **engine, unsigned int *signo,

 	md5_field = 1;

     }

-    while(fgets(buffer, FILEBUFF, fd)) {

+    while(cli_dbgets(buffer, FILEBUFF, fs, gzs, &gzrsize)) {

 	line++;

 	cli_chomp(buffer);

@@ -852,7 +874,7 @@ static int cli_loadmd5(FILE *fd, struct cl_engine **engine, unsigned int *signo,

     return CL_SUCCESS;

 }

-static int cli_loadmd(FILE *fd, struct cl_engine **engine, unsigned int *signo, int type, unsigned int options)

+static int cli_loadmd(FILE *fs, struct cl_engine **engine, unsigned int *signo, int type, unsigned int options, gzFile *gzs, unsigned int gzrsize)

 {

 	char buffer[FILEBUFF], *pt;

 	int line = 0, comments = 0, ret = 0, crc32;

@@ -864,7 +886,7 @@ static int cli_loadmd(FILE *fd, struct cl_engine **engine, unsigned int *signo,

 	return ret;

     }

-    while(fgets(buffer, FILEBUFF, fd)) {

+    while(cli_dbgets(buffer, FILEBUFF, fs, gzs, &gzrsize)) {

 	line++;

 	if(buffer[0] == '#') {

 	    comments++;

@@ -1026,20 +1048,20 @@ static int cli_loadmd(FILE *fd, struct cl_engine **engine, unsigned int *signo,

 static int cli_loaddbdir(const char *dirname, struct cl_engine **engine, unsigned int *signo, unsigned int options);

-static int cli_load(const char *filename, struct cl_engine **engine, unsigned int *signo, unsigned int options)

+int cli_load(const char *filename, struct cl_engine **engine, unsigned int *signo, unsigned int options, gzFile *gzs, unsigned int gzrsize)

 {

-	FILE *fd;

+	FILE *fs = NULL;

 	int ret = CL_SUCCESS;

 	uint8_t skipped = 0;

-    if((fd = fopen(filename, "rb")) == NULL) {

+    if(!gzs && (fs = fopen(filename, "rb")) == NULL) {

 	cli_errmsg("cli_load(): Can't open file %s\n", filename);

 	return CL_EOPEN;

     }

     if(cli_strbcasestr(filename, ".db")) {

-	ret = cli_loaddb(fd, engine, signo, options);

+	ret = cli_loaddb(fs, engine, signo, options, gzs, gzrsize);

     } else if(cli_strbcasestr(filename, ".cvd")) {

 	    int warn = 0;

@@ -1047,66 +1069,66 @@ static int cli_load(const char *filename, struct cl_engine **engine, unsigned in

 	if(strstr(filename, "daily.cvd"))

 	    warn = 1;

-	ret = cli_cvdload(fd, engine, signo, warn, options);

+	ret = cli_cvdload(fs, engine, signo, warn, options);

     } else if(cli_strbcasestr(filename, ".hdb")) {

-	ret = cli_loadmd5(fd, engine, signo, MD5_HDB, options);

+	ret = cli_loadmd5(fs, engine, signo, MD5_HDB, options, gzs, gzrsize);

     } else if(cli_strbcasestr(filename, ".hdu")) {

 	if(options & CL_DB_PUA)

-	    ret = cli_loadmd5(fd, engine, signo, MD5_HDB, options);

+	    ret = cli_loadmd5(fs, engine, signo, MD5_HDB, options, gzs, gzrsize);

 	else

 	    skipped = 1;

     } else if(cli_strbcasestr(filename, ".fp")) {

-	ret = cli_loadmd5(fd, engine, signo, MD5_FP, options);

+	ret = cli_loadmd5(fs, engine, signo, MD5_FP, options, gzs, gzrsize);

     } else if(cli_strbcasestr(filename, ".mdb")) {

-	ret = cli_loadmd5(fd, engine, signo, MD5_MDB, options);

+	ret = cli_loadmd5(fs, engine, signo, MD5_MDB, options, gzs, gzrsize);

     } else if(cli_strbcasestr(filename, ".mdu")) {

 	if(options & CL_DB_PUA)

-	    ret = cli_loadmd5(fd, engine, signo, MD5_MDB, options);

+	    ret = cli_loadmd5(fs, engine, signo, MD5_MDB, options, gzs, gzrsize);

 	else

 	    skipped = 1;

     } else if(cli_strbcasestr(filename, ".ndb")) {

-	ret = cli_loadndb(fd, engine, signo, 0, options);

+	ret = cli_loadndb(fs, engine, signo, 0, options, gzs, gzrsize);

     } else if(cli_strbcasestr(filename, ".ndu")) {

 	if(!(options & CL_DB_PUA))

 	    skipped = 1;

 	else

-	    ret = cli_loadndb(fd, engine, signo, 0, options);

+	    ret = cli_loadndb(fs, engine, signo, 0, options, gzs, gzrsize);

     } else if(cli_strbcasestr(filename, ".sdb")) {

-	ret = cli_loadndb(fd, engine, signo, 1, options);

+	ret = cli_loadndb(fs, engine, signo, 1, options, gzs, gzrsize);

     } else if(cli_strbcasestr(filename, ".zmd")) {

-	ret = cli_loadmd(fd, engine, signo, 1, options);

+	ret = cli_loadmd(fs, engine, signo, 1, options, gzs, gzrsize);

     } else if(cli_strbcasestr(filename, ".rmd")) {

-	ret = cli_loadmd(fd, engine, signo, 2, options);

+	ret = cli_loadmd(fs, engine, signo, 2, options, gzs, gzrsize);

     } else if(cli_strbcasestr(filename, ".cfg")) {

-	ret = cli_dconf_load(fd, engine, options);

+	ret = cli_dconf_load(fs, engine, options, gzs, gzrsize);

     } else if(cli_strbcasestr(filename, ".wdb")) {

-	if(options & CL_DB_PHISHING_URLS)

-	    ret = cli_loadwdb(fd, engine, options);

-	else

+	if(options & CL_DB_PHISHING_URLS) {

+	    ret = cli_loadwdb(fs, engine, options, gzs, gzrsize);

+	} else

 	    skipped = 1;

     } else if(cli_strbcasestr(filename, ".pdb")) {

-	if(options & CL_DB_PHISHING_URLS)

-	    ret = cli_loadpdb(fd, engine, options);

-	else

+	if(options & CL_DB_PHISHING_URLS) {

+	    ret = cli_loadpdb(fs, engine, options, gzs, gzrsize);

+	} else

 	    skipped = 1;

     } else if(cli_strbcasestr(filename, ".ft")) {

-	ret = cli_loadft(fd, engine, options, 0);

+	ret = cli_loadft(fs, engine, options, 0, gzs, gzrsize);

     } else {

 	cli_dbgmsg("cli_load: unknown extension - assuming old database format\n");

-	ret = cli_loaddb(fd, engine, signo, options);

+	ret = cli_loaddb(fs, engine, signo, options, gzs, gzrsize);

     }

     if(ret) {

@@ -1118,36 +1140,16 @@ static int cli_load(const char *filename, struct cl_engine **engine, unsigned in

 	    cli_dbgmsg("%s loaded\n", filename);

     }

-    fclose(fd);

+    if(fs)

+	fclose(fs);

+

     return ret;

 }

 int cl_loaddb(const char *filename, struct cl_engine **engine, unsigned int *signo) {

-    return cli_load(filename, engine, signo, CL_DB_STDOPT);

+    return cli_load(filename, engine, signo, CL_DB_STDOPT, NULL, 0);

 }

-#define CLI_DBEXT(ext)				\

-    (						\

-	cli_strbcasestr(ext, ".db")    ||	\

-	cli_strbcasestr(ext, ".db2")   ||	\

-	cli_strbcasestr(ext, ".db3")   ||	\

-	cli_strbcasestr(ext, ".hdb")   ||	\

-	cli_strbcasestr(ext, ".hdu")   ||	\

-	cli_strbcasestr(ext, ".fp")    ||	\

-	cli_strbcasestr(ext, ".mdb")   ||	\

-	cli_strbcasestr(ext, ".mdu")   ||	\

-	cli_strbcasestr(ext, ".ndb")   ||	\

-	cli_strbcasestr(ext, ".ndu")   ||	\

-	cli_strbcasestr(ext, ".sdb")   ||	\

-	cli_strbcasestr(ext, ".zmd")   ||	\

-	cli_strbcasestr(ext, ".rmd")   ||	\

-	cli_strbcasestr(ext, ".pdb")   ||	\

-	cli_strbcasestr(ext, ".wdb")   ||	\

-	cli_strbcasestr(ext, ".ft")    ||	\

-	cli_strbcasestr(ext, ".inc")   ||	\

-	cli_strbcasestr(ext, ".cvd")		\

-    )

-

 static int cli_loaddbdir_l(const char *dirname, struct cl_engine **engine, unsigned int *signo, unsigned int options)

 {

 	DIR *dd;

@@ -1171,7 +1173,7 @@ static int cli_loaddbdir_l(const char *dirname, struct cl_engine **engine, unsig

 	return CL_EMEM;

     sprintf(dbfile, "%s/daily.cfg", dirname);

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

-	if((ret = cli_load(dbfile, engine, signo, options))) {

+	if((ret = cli_load(dbfile, engine, signo, options, NULL, 0))) {

 	    free(dbfile);

 	    return ret;

 	}

@@ -1208,7 +1210,7 @@ static int cli_loaddbdir_l(const char *dirname, struct cl_engine **engine, unsig

 		if(cli_strbcasestr(dbfile, ".inc"))

 		    ret = cli_loaddbdir(dbfile, engine, signo, options);

 		else

-		    ret = cli_load(dbfile, engine, signo, options);

+		    ret = cli_load(dbfile, engine, signo, options, NULL, 0);

 		if(ret) {

 		    cli_dbgmsg("cli_loaddbdir(): error loading database %s\n", dbfile);

@@ -1277,7 +1279,7 @@ int cl_load(const char *path, struct cl_engine **engine, unsigned int *signo, un

     switch(sb.st_mode & S_IFMT) {

 	case S_IFREG: 

-	    ret = cli_load(path, engine, signo, options);

+	    ret = cli_load(path, engine, signo, options, NULL, 0);

 	    break;

 	case S_IFDIR:

@@ -1603,7 +1605,7 @@ int cl_build(struct cl_engine *engine)

 	return CL_ENULLARG;

     if(!engine->ftypes)

-	if((ret = cli_loadft(NULL, &engine, 0, 1)))

+	if((ret = cli_loadft(NULL, &engine, 0, 1, NULL, 0)))

 	    return ret;

     for(i = 0; i < CL_TARGET_TABLE_SIZE; i++)

@@ -19,11 +19,41 @@

 #ifndef __READDB_H

 #define __READDB_H

+#include <zlib.h>

+

 #include "clamav.h"

 #include "matcher.h"

+#include "str.h"

+

+#define CLI_DBEXT(ext)				\

+    (						\

+	cli_strbcasestr(ext, ".db")    ||	\

+	cli_strbcasestr(ext, ".db2")   ||	\

+	cli_strbcasestr(ext, ".db3")   ||	\

+	cli_strbcasestr(ext, ".hdb")   ||	\

+	cli_strbcasestr(ext, ".hdu")   ||	\

+	cli_strbcasestr(ext, ".fp")    ||	\

+	cli_strbcasestr(ext, ".mdb")   ||	\

+	cli_strbcasestr(ext, ".mdu")   ||	\

+	cli_strbcasestr(ext, ".ndb")   ||	\

+	cli_strbcasestr(ext, ".ndu")   ||	\

+	cli_strbcasestr(ext, ".sdb")   ||	\

+	cli_strbcasestr(ext, ".zmd")   ||	\

+	cli_strbcasestr(ext, ".rmd")   ||	\

+	cli_strbcasestr(ext, ".pdb")   ||	\

+	cli_strbcasestr(ext, ".wdb")   ||	\

+	cli_strbcasestr(ext, ".ft")    ||	\

+	cli_strbcasestr(ext, ".inc")   ||	\

+	cli_strbcasestr(ext, ".cvd")		\

+    )

+

 int cli_parse_add(struct cli_matcher *root, const char *virname, const char *hexsig, unsigned short type, const char *offset, unsigned short target);

 int cli_initengine(struct cl_engine **engine, unsigned int options);

+int cli_load(const char *filename, struct cl_engine **engine, unsigned int *signo, unsigned int options, gzFile *gzs, unsigned int gzrsize);

+

+char *cli_dbgets(char *buff, unsigned int size, FILE *fs, gzFile *gzs, unsigned int *gzrsize);

+

 #endif

@@ -48,6 +48,7 @@

 #include <stdlib.h>

 #include <string.h>

 #include <ctype.h>

+#include <zlib.h>

 #include <limits.h>

 #include <sys/types.h>

@@ -60,6 +61,7 @@

 #include "regex_list.h"

 #include "matcher-ac.h"

 #include "str.h"

+#include "readdb.h"

 /*Tree*/

 enum token_op_t {OP_CHAR,OP_STDCLASS,OP_CUSTOMCLASS,OP_DOT,OP_LEAF,OP_ROOT,OP_PARCLOSE};

@@ -513,13 +515,12 @@ static int functionality_level_check(char* line)

 /* Load patterns/regexes from file */

-int load_regex_matcher(struct regex_matcher* matcher,FILE* fd,unsigned int options,int is_whitelist)

+int load_regex_matcher(struct regex_matcher* matcher,FILE* fd,unsigned int options,int is_whitelist,gzFile *gzs,unsigned int gzrsize)

 {

 	int rc,line=0;

 	char buffer[FILEBUFF];

 	massert(matcher);

-	massert(fd);

 	if(matcher->list_inited==-1)

 		return CL_EMALFDB; /* already failed to load */

@@ -527,7 +528,7 @@ int load_regex_matcher(struct regex_matcher* matcher,FILE* fd,unsigned int optio

 		cli_warnmsg("Regex list has already been loaded, ignoring further requests for load\n");

 		return CL_SUCCESS;

 	}*/

-	if(!fd) {

+	if(!fd && !gzs) {

 		cli_errmsg("Unable to load regex list (null file)\n");

 		return CL_EIO;

 	}

@@ -562,7 +563,7 @@ int load_regex_matcher(struct regex_matcher* matcher,FILE* fd,unsigned int optio

 	 * If a line in the file doesn't conform to this format, loading fails

 	 * 

 	 */

-	while(fgets(buffer,FILEBUFF,fd)) {

+	while(cli_dbgets(buffer, FILEBUFF, fd, gzs, &gzrsize)) {

 		char* pattern;

 		char* flags;

 		cli_chomp(buffer);

@@ -34,6 +34,7 @@

 #endif

 #include "phishcheck.h"

+#include <zlib.h> /* for gzFile */

 struct node_stack {

 	struct tree_node** data;

 	size_t capacity;

@@ -54,7 +55,7 @@ struct regex_matcher {

 int regex_list_match(struct regex_matcher* matcher, char* real_url,const char* display_url,const struct pre_fixup_info* pre_fixup, int hostOnly,const char** info,int is_whitelist);

 int init_regex_list(struct regex_matcher* matcher);

-int load_regex_matcher(struct regex_matcher* matcher,FILE* fd,unsigned int options,int is_whitelist);

+int load_regex_matcher(struct regex_matcher* matcher,FILE* fd,unsigned int options,int is_whitelist,gzFile *gzs,unsigned int gzrsize);

 void regex_list_cleanup(struct regex_matcher* matcher);

 void regex_list_done(struct regex_matcher* matcher);

 int is_regex_ok(struct regex_matcher* matcher);