read .db3 files from cvd

git-svn: trunk@662

clamav-devel/ChangeLog

@@ -1,3 +1,7 @@
+Thu Jul  8 19:12:14 CEST 2004 (tk)
+----------------------------------
+  * libclamav: read .db3 files from cvd
+
 Thu Jul  8 15:39:29 CEST 2004 (tk)
 ----------------------------------
   * libclamav: extend engine to support character alternatives (a|b|..|z)

clamav-devel/libclamav/matcher.c

@@ -282,7 +282,12 @@ int j;
 			    if(dist && pt->mindist)
 				if(offset + i - partoff[pt->sigid] < pt->mindist)
 				    dist = 0;
-
+/*
+			    printf("dist == %d\n", dist);
+			    printf("curr offset == %d\n", offset + i);
+			    printf("min dist == %d\n", pt->mindist);
+			    printf("max dist == %d\n", pt->maxdist);
+*/
 
 			    if(dist) {
 				partoff[pt->sigid] = offset + i + pt->length;

clamav-devel/libclamav/readdb.c

@@ -453,6 +453,7 @@ int cl_loaddbdir(const char *dirname, struct cl_node **root, int *virnum)
 	    if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..") &&
 	    (cli_strbcasestr(dent->d_name, ".db")  ||
 	     cli_strbcasestr(dent->d_name, ".db2") ||
+	     cli_strbcasestr(dent->d_name, ".db3") ||
 	     cli_strbcasestr(dent->d_name, ".cvd"))) {
 
 		dbfile = (char *) cli_calloc(strlen(dent->d_name) + strlen(dirname) + 2, sizeof(char));
@@ -506,7 +507,7 @@ int cl_statinidir(const char *dirname, struct cl_stat *dbstat)
 	if(dent->d_ino)
 #endif
 	{
-	    if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..") && (cli_strbcasestr(dent->d_name, ".db") || cli_strbcasestr(dent->d_name, ".db2") || cli_strbcasestr(dent->d_name, ".cvd"))) {
+	    if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..") && (cli_strbcasestr(dent->d_name, ".db") || cli_strbcasestr(dent->d_name, ".db2") || cli_strbcasestr(dent->d_name, ".db3") || cli_strbcasestr(dent->d_name, ".cvd"))) {
 
 		dbstat->no++;
 		dbstat->stattab = (struct stat *) realloc(dbstat->stattab, dbstat->no * sizeof(struct stat));
@@ -548,7 +549,7 @@ int cl_statchkdir(const struct cl_stat *dbstat)
 	if(dent->d_ino)
 #endif
 	{
-	    if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..") && (cli_strbcasestr(dent->d_name, ".db") || cli_strbcasestr(dent->d_name, ".db2") || cli_strbcasestr(dent->d_name, ".cvd"))) {
+	    if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..") && (cli_strbcasestr(dent->d_name, ".db") || cli_strbcasestr(dent->d_name, ".db2") || cli_strbcasestr(dent->d_name, ".db3") || cli_strbcasestr(dent->d_name, ".cvd"))) {
 
                 fname = cli_calloc(strlen(dbstat->dir) + strlen(dent->d_name) + 2, sizeof(char));
 		sprintf(fname, "%s/%s", dbstat->dir, dent->d_name);

clamav-devel/sigtool/sigtool.c

@@ -577,7 +577,7 @@ int build(struct optstruct *opt)
 	    exit(1);
 	case 0:
 	    {
-		char *args[] = { "tar", "-cvf", tarfile, "COPYING", "viruses.db", "viruses.db2", "Notes", NULL };
+		char *args[] = { "tar", "-cvf", tarfile, "COPYING", "viruses.db", "viruses.db2", "Notes", "viruses.db3", NULL };
 		execv("/bin/tar", args);
 		mprintf("!Can't execute tar\n");
 		perror("tar");