Browse code

sigtool/sigtool.c: handle .ldb/.ldu files (bb#896)

git-svn: trunk@4001

Tomasz Kojm authored on 2008/07/27 01:59:45
Showing 2 changed files
... ...
@@ -1,3 +1,7 @@
1
+Sat Jul 26 18:41:40 CEST 2008 (tk)
2
+----------------------------------
3
+  * sigtool/sigtool.c: handle .ldb/.ldu files (bb#896)
4
+
1 5
 Sat Jul 26 17:30:02 CEST 2008 (tk)
2 6
 ----------------------------------
3 7
   * libclamav: lsigs: handle extended block modifiers (bb#896)
... ...
@@ -84,6 +84,8 @@ static const struct dblist_s {
84 84
     { "main.mdu",   1 },    { "daily.mdu",  1 },
85 85
     { "main.ndb",   1 },    { "daily.ndb",  1 },
86 86
     { "main.ndu",   1 },    { "daily.ndu",  1 },
87
+    { "main.ldb",   1 },    { "daily.ldb",  1 },
88
+    { "main.ldu",   1 },    { "daily.ldu",  1 },
87 89
     { "main.sdb",   1 },    { "daily.sdb",  1 },
88 90
     { "main.zmd",   1 },    { "daily.zmd",  1 },
89 91
     { "main.rmd",   1 },    { "daily.rmd",  1 },
... ...
@@ -985,6 +987,8 @@ static int listdir(const char *dirname)
985 985
 	     cli_strbcasestr(dent->d_name, ".mdu") ||
986 986
 	     cli_strbcasestr(dent->d_name, ".ndb") ||
987 987
 	     cli_strbcasestr(dent->d_name, ".ndu") ||
988
+	     cli_strbcasestr(dent->d_name, ".ldb") ||
989
+	     cli_strbcasestr(dent->d_name, ".ldu") ||
988 990
 	     cli_strbcasestr(dent->d_name, ".sdb") ||
989 991
 	     cli_strbcasestr(dent->d_name, ".zmd") ||
990 992
 	     cli_strbcasestr(dent->d_name, ".rmd") ||
... ...
@@ -1127,12 +1131,16 @@ static int listdb(const char *filename)
1127 1127
 	    free(start);
1128 1128
 	}
1129 1129
 
1130
-    } else if(cli_strbcasestr(filename, ".ndb") || cli_strbcasestr(filename, ".ndu") || cli_strbcasestr(filename, ".sdb") || cli_strbcasestr(filename, ".zmd") || cli_strbcasestr(filename, ".rmd")) {
1130
+    } else if(cli_strbcasestr(filename, ".ndb") || cli_strbcasestr(filename, ".ndu") || cli_strbcasestr(filename, ".ldb") || cli_strbcasestr(filename, ".ldu") || cli_strbcasestr(filename, ".sdb") || cli_strbcasestr(filename, ".zmd") || cli_strbcasestr(filename, ".rmd")) {
1131 1131
 
1132 1132
 	while(fgets(buffer, FILEBUFF, fh)) {
1133 1133
 	    line++;
1134 1134
 	    cli_chomp(buffer);
1135
-	    start = cli_strtok(buffer, 0, ":");
1135
+
1136
+	    if(cli_strbcasestr(filename, ".ldb") || cli_strbcasestr(filename, ".ldu"))
1137
+		start = cli_strtok(buffer, 0, ";");
1138
+	    else
1139
+		start = cli_strtok(buffer, 0, ":");
1136 1140
 
1137 1141
 	    if(!start) {
1138 1142
 		mprintf("!listdb: Malformed pattern line %u (file %s)\n", line, filename);