From a891c2d9d60f6d84e0e870107156f2d09f9f57f9 Mon Sep 17 00:00:00 2001 From: Tomasz Kojm Date: Sat, 28 Oct 2006 15:34:40 +0000 Subject: [PATCH] .pdb/.wdb files now use colon as delimiter git-svn: trunk@2444 --- clamav-devel/ChangeLog | 4 ++++ clamav-devel/libclamav/regex_list.c | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/clamav-devel/ChangeLog b/clamav-devel/ChangeLog index 7508b18b4..47633c5d9 100644 --- a/clamav-devel/ChangeLog +++ b/clamav-devel/ChangeLog @@ -1,3 +1,7 @@ +Sat Oct 28 17:33:06 CEST 2006 (tk) +---------------------------------- + * libclamav/regex_list.c: .pdb/.wdb files now use colon as delimiter + Sat Oct 28 15:52:42 CEST 2006 (tk) ---------------------------------- * libclamav/elf.c: make the code reentrant (closes bug#57) diff --git a/clamav-devel/libclamav/regex_list.c b/clamav-devel/libclamav/regex_list.c index 4cdbabc5d..5b75c7e11 100644 --- a/clamav-devel/libclamav/regex_list.c +++ b/clamav-devel/libclamav/regex_list.c @@ -19,6 +19,9 @@ * MA 02110-1301, USA. * * $Log: regex_list.c,v $ + * Revision 1.12 2006/10/28 15:34:40 tkojm + * .pdb/.wdb files now use colon as delimiter + * * Revision 1.11 2006/10/15 19:16:33 tkojm * allow loading multiple .pdb/.wdb files * @@ -348,7 +351,7 @@ int regex_list_match(struct regex_matcher* matcher,const char* real_url,const ch return CL_EMEM; strncpy(buffer,real_url,real_len); - buffer[real_len]= (!is_whitelist && hostOnly) ? '\0' : ' '; + buffer[real_len]= (!is_whitelist && hostOnly) ? '\0' : ':'; if(!hostOnly || is_whitelist) { strncpy(buffer+real_len+1,display_url,display_len); buffer[buffer_len]=0; @@ -557,7 +560,7 @@ int load_regex_matcher(struct regex_matcher* matcher,FILE* fd,unsigned int optio cli_chomp(buffer); if(!*buffer) continue;/* skip empty lines */ - pattern = strchr(buffer,' '); + pattern = strchr(buffer,':'); if(!pattern) { cli_errmsg("Malformed regex list line %d\n",line); fatal_error(matcher);