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

+Fri Jul 18 19:33:41 CEST 2008 (tk)

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

+  * libclamav: use a regex for the filename field in .zmd/.rmd (bb#193)

+

 Fri Jul 18 18:25:32 CEST 2008 (tk)

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

   * freshclam/freshclam.c: improve some msgs (bb#1066)

@@ -77,6 +77,7 @@ static pthread_mutex_t cli_ctime_mutex = PTHREAD_MUTEX_INITIALIZER;

 #include "others.h"

 #include "md5.h"

 #include "cltypes.h"

+#include "regex/regex.h"

 #ifndef	O_BINARY

 #define	O_BINARY	0

@@ -953,3 +954,16 @@ const char* cli_ctime(const time_t *timep, char *buf, const size_t bufsize)

 	return ret;

 }

+int cli_matchregex(const char *str, const char *regex)

+{

+	regex_t reg;

+	int match;

+

+    if(cli_regcomp(&reg, regex, REG_EXTENDED) == 0) {

+	match = (cli_regexec(&reg, str, 0, NULL, 0) == REG_NOMATCH) ? 0 : 1;

+	cli_regfree(&reg);

+	return match;

+    }

+

+    return 0;

+}

@@ -275,4 +275,5 @@ const char* cli_ctime(const time_t *timep, char *buf, const size_t bufsize);

 int cli_checklimits(const char *, cli_ctx *, unsigned long, unsigned long, unsigned long);

 int cli_updatelimits(cli_ctx *, unsigned long);

 unsigned long cli_getsizelimit(cli_ctx *, unsigned long);

+int cli_matchregex(const char *str, const char *regex);

 #endif

@@ -239,9 +239,7 @@ static int cli_unrar_scanmetadata(int desc, unrar_metadata_t *metadata, cli_ctx

 	if(mdata->maxdepth && ctx->recursion > mdata->maxdepth)

 	    continue;

-	/* TODO add support for regex */

-	/*if(mdata->filename && !strstr(zdirent.d_name, mdata->filename))*/

-	if(mdata->filename && strcmp((char *) metadata->filename, mdata->filename))

+	if(mdata->filename && !cli_matchregex(metadata->filename, mdata->filename))

 	    continue;

 	break; /* matched */

@@ -347,7 +347,7 @@ static unsigned int lhdr(uint8_t *zip, uint32_t zsize, unsigned int *fu, unsigne

 	 (meta->method>0 && meta->method != LH_method) ||

 	 (meta->fileno   && meta->fileno != fc ) ||

 	 (meta->maxdepth && ctx->recursion > meta->maxdepth) ||

-	 (meta->filename && strcmp(name, meta->filename)) /* TODO: use a regex */

+	 (meta->filename && !cli_matchregex(name, meta->filename))

 	 )

 	) meta = meta->next;

   if(meta) {