2009-06-29 [colin] 3.7.1cvs82

	* src/matcher_parser_lex.l
		Fix bug 1878, 'Processing rules for folders with brackets aren't saved'

diff --git a/ChangeLog b/ChangeLog
index 0e49e9edbbcaf5e92b0b182fef3bd352b893fb21..665b4a4f14b568d3e2154f517f48df877db6e60c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-29 [colin]     3.7.1cvs82
+
+       * src/matcher_parser_lex.l
+               Fix bug 1878, 'Processing rules for folders with brackets aren't saved'
+

 2009-06-29 [colin]     3.7.1cvs81
 
        * src/addressbook.c
 2009-06-29 [colin]     3.7.1cvs81
 
        * src/addressbook.c

diff --git a/PATCHSETS b/PATCHSETS
index 0be259ab1e41cdc93a803c3bf071f58c223aac84..922d80b461bd11d9bb1c701b31082ac5add1e188 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3821,3 +3821,4 @@
 ( cvs diff -u -r 1.395.2.412 -r 1.395.2.413 src/summaryview.c;  ) > 3.7.1cvs79.patchset
 ( cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/ldapupdate.c;  cvs diff -u -r 1.12.2.20 -r 1.12.2.21 src/ldif.c;  ) > 3.7.1cvs80.patchset
 ( cvs diff -u -r 1.60.2.133 -r 1.60.2.134 src/addressbook.c;  cvs diff -u -r 1.11.2.22 -r 1.11.2.23 src/editgroup.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.4.56 -r 1.1.4.57 src/gtk/gtksctree.c;  ) > 3.7.1cvs81.patchset
 ( cvs diff -u -r 1.395.2.412 -r 1.395.2.413 src/summaryview.c;  ) > 3.7.1cvs79.patchset
 ( cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/ldapupdate.c;  cvs diff -u -r 1.12.2.20 -r 1.12.2.21 src/ldif.c;  ) > 3.7.1cvs80.patchset
 ( cvs diff -u -r 1.60.2.133 -r 1.60.2.134 src/addressbook.c;  cvs diff -u -r 1.11.2.22 -r 1.11.2.23 src/editgroup.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.4.56 -r 1.1.4.57 src/gtk/gtksctree.c;  ) > 3.7.1cvs81.patchset

+( cvs diff -u -r 1.16.2.13 -r 1.16.2.14 src/matcher_parser_lex.l;  ) > 3.7.1cvs82.patchset

diff --git a/configure.ac b/configure.ac
index 5fed405e1a915505376296e7cce3a93c52bc6d6d..433a009c35f7af5820b145f7eea8b77896bab617 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=81
+EXTRA_VERSION=82

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/matcher_parser_lex.l b/src/matcher_parser_lex.l
index 3ef4de758b3e527cc6d980c2cd99486f10e25130..bf36c58c80e0ddc9a03336f47a24058c31645714 100644 (file)
--- a/src/matcher_parser_lex.l
+++ b/src/matcher_parser_lex.l
@@ -31,7 +31,7 @@
 #include "matcher_parser_parse.h"
 #endif
 
 #include "matcher_parser_parse.h"
 #endif
 

-#define MAX_STR_CONST 512
+#define MAX_STR_CONST 8192

 
 static char string_buf[MAX_STR_CONST];
 static char *string_buf_ptr;
 
 static char string_buf[MAX_STR_CONST];
 static char *string_buf_ptr;


@@ -104,7 +104,7 @@ void matcher_parser_init(void)
 <string>.      {
                add_char(yytext[0]);
                }
 <string>.      {
                add_char(yytext[0]);
                }

-\[[^\[\]]*\]   {
+^\[.*\]$       {

                 /* for section name in configuration file */
                BEGIN(0);
                yylval.str = yytext + 1;
                 /* for section name in configuration file */
                BEGIN(0);
                yylval.str = yytext + 1;