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

+Thu Sep 16 14:37:15 CEST 2010 (tk)

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

+ * clamconf: print information about 3rd party databases

+

 Wed Sep 15 19:00:15 CEST 2010 (tk)

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

  * sigtool/sigtool.c: print db names in --find-sigs

@@ -31,6 +31,9 @@

 #include <sys/utsname.h>

 #endif

 #include <zlib.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <dirent.h>

 #include "shared/optparser.h"

 #include "shared/misc.h"

@@ -38,6 +41,7 @@

 #include "libclamav/str.h"

 #include "libclamav/clamav.h"

 #include "libclamav/others.h"

+#include "libclamav/readdb.h"

 #include "libclamav/bytecode.h"

 #include "libclamav/bytecode_detect.h"

 #include "target.h"

@@ -58,11 +62,6 @@ static struct _cfgfile {

     { NULL,		    0		    }

 };

-static const char *dbnames[] = { "main.cvd", "main.cld", "daily.cvd",

-				 "daily.cld", "safebrowsing.cvd",

-				 "safebrowsing.cld", "bytecode.cvd",

-				 "bytecode.cld", NULL };

-

 static void printopts(struct optstruct *opts, int nondef)

 {

 	const struct optstruct *opt;

@@ -306,6 +305,56 @@ static void print_build(struct cli_environment *env)

 	   env->dconf_level);

 }

+static void print_dbs(const char *dir)

+{

+	DIR *dd;

+	struct dirent *dent;

+	char *dbfile;

+	unsigned int flevel = cl_retflevel(), cnt, sigs = 0;

+	struct cl_cvd *cvd;

+

+    if((dd = opendir(dir)) == NULL) {

+        printf("print_dbs: Can't open directory %s\n", dir);

+        return;

+    }

+

+    while((dent = readdir(dd))) {

+	if(dent->d_ino) {

+	    if(CLI_DBEXT(dent->d_name)) {

+		dbfile = (char *) malloc(strlen(dent->d_name) + strlen(dir) + 2);

+		if(!dbfile) {

+		    printf("print_dbs: Can't allocate memory for dbfile\n");

+		    return;

+		}

+		sprintf(dbfile, "%s"PATHSEP"%s", dir, dent->d_name);

+		if(cli_strbcasestr(dbfile, ".cvd") || cli_strbcasestr(dbfile, ".cld")) {

+		    cvd = cl_cvdhead(dbfile);

+		    if(!cvd) {

+			printf("%s: Can't get information about the database\n", dbfile);

+		    } else {

+			const time_t t = cvd->stime;

+			printf("%s: version %u, sigs: %u, built on %s", dent->d_name, cvd->version, cvd->sigs, ctime(&t));

+			sigs += cvd->sigs;

+			if(cvd->fl > flevel)

+			    printf("%s: WARNING: This database requires f-level %u (current f-level: %u)\n", dent->d_name, cvd->fl, flevel);

+			cl_cvdfree(cvd);

+		    }

+		} else if(cli_strbcasestr(dbfile, ".cbc")) {

+		    printf("[3rd Party] %s: bytecode\n", dent->d_name);

+		    sigs++;

+		} else {

+		    cnt = countlines(dbfile);

+		    printf("[3rd Party] %s: %u sig%c\n", dent->d_name, cnt, cnt > 1 ? 's' : ' ');

+		    sigs += cnt;

+		}

+		free(dbfile);

+	    }

+	}

+    }

+    closedir(dd);

+    printf("Total number of signatures: %u\n", sigs);

+}

+

 int main(int argc, char **argv)

 {

 	const char *dir;

@@ -313,8 +362,6 @@ int main(int argc, char **argv)

 	struct optstruct *opts, *toolopts;

 	const struct optstruct *opt;

 	unsigned int i, j;

-	struct cl_cvd *cvd;

-	unsigned int flevel;

 	struct cli_environment env;

@@ -416,26 +463,13 @@ int main(int argc, char **argv)

 	}

 	dbdir[sizeof(dbdir) - 1] = 0;

     }

+

+    printf("\nDatabase information\n--------------------\n");

     printf("Database directory: %s\n", dbdir);

     if(strcmp(dbdir, clamd_dbdir))

 	printf("WARNING: freshclam.conf and clamd.conf point to different database directories\n");

-    flevel = cl_retflevel();

-    for(i = 0; dbnames[i]; i++) {

-	snprintf(path, sizeof(path), "%s"PATHSEP"%s", dbdir, dbnames[i]);

-	path[511] = 0;

-	if(!access(path, R_OK)) {

-	    cvd = cl_cvdhead(path);

-	    if(!cvd) {

-		printf("%s: Can't get information about the database\n", dbnames[i]);

-	    } else {

-		const time_t t = cvd->stime;

-		printf("%s: version %u, sigs: %u, built on %s", dbnames[i], cvd->version, cvd->sigs, ctime(&t));

-		if(cvd->fl > flevel)

-		    printf("%s: WARNING: This database requires f-level %u (current f-level: %u)\n", dbnames[i], cvd->fl, flevel);

-		cl_cvdfree(cvd);

-	    }

-	}

-    }

+    print_dbs(dbdir);

+

     cli_detect_environment(&env);

     print_platform(&env);

     print_build(&env);

@@ -348,3 +348,23 @@ int cli_is_abspath(const char *path) {

     return *path == '/';

 #endif

 }

+

+unsigned int countlines(const char *filename)

+{

+	FILE *fh;

+	char buff[1024];

+	unsigned int lines = 0;

+

+

+    if((fh = fopen(filename, "r")) == NULL)

+	return 0;

+

+    while(fgets(buff, sizeof(buff), fh)) {

+	if(buff[0] == '#') continue;

+	lines++;

+    }

+

+    fclose(fh);

+    return lines;

+}

+

@@ -53,5 +53,6 @@ const char *get_version(void);

 int match_regex(const char *filename, const char *pattern);

 int cfg_tcpsock(const struct optstruct *opts, struct sockaddr_in *server, in_addr_t defaultbind);

 int cli_is_abspath(const char *path);

+unsigned int countlines(const char *filename);

 #endif

@@ -263,25 +263,6 @@ static int utf16decode(const struct optstruct *opts)

     return 0;

 }

-static unsigned int countlines(const char *filename)

-{

-	FILE *fh;

-	char buff[1024];

-	unsigned int lines = 0;

-

-

-    if((fh = fopen(filename, "r")) == NULL)

-	return 0;

-

-    while(fgets(buff, sizeof(buff), fh)) {

-	if(buff[0] == '#') continue;

-	lines++;

-    }

-

-    fclose(fh);

-    return lines;

-}

-

 static char *getdsig(const char *host, const char *user, const unsigned char *data, unsigned int datalen, unsigned short mode)

 {

 	char buff[512], cmd[128], pass[30], *pt;