Don't modify original search_string or it'll change

the next iterations in the for()

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a1d55a67abee1fa5793c85fd35442e7e91580544..8b0f0a58aa2983e27fdd2cfdd81a4fdc58637d75 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,16 +1,22 @@
+2002-12-05 [colin]     0.8.6claws65
+       
+       * src/common/utils.c
+               Don't modify original search_string or it'll change
+               the next iterations in the for()
+

 2002-12-05 [darko]     0.8.6claws64
 
 2002-12-05 [darko]     0.8.6claws64
 

-       * src/utils.c
+       * src/common/utils.c

                proper check for filtering commands, found by Colin
 
 2002-12-05 [darko]     0.8.6claws63
 
                proper check for filtering commands, found by Colin
 
 2002-12-05 [darko]     0.8.6claws63
 

-       * src/utils.c
+       * src/common/utils.c

                check proper string for NULL pointer, found by Colin
 
 2002-12-05 [darko]     0.8.6claws62
 
                check proper string for NULL pointer, found by Colin
 
 2002-12-05 [darko]     0.8.6claws62
 

-       * src/utils.[ch]
+       * src/common/utils.[ch]

                expand_search_string(): new function
                converts Mutt-like patterns to Sylpheed's
                filtering engine
                expand_search_string(): new function
                converts Mutt-like patterns to Sylpheed's
                filtering engine

diff --git a/configure.in b/configure.in
index 9cbc5296241aed468a5e1711409aa01b0ba393c3..bbb2a841387ab56c3441fa8cc2ccc2b3234ca40f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws64
+EXTRA_VERSION=claws65

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/common/utils.c b/src/common/utils.c
index 39aab7b520201602cd8694e54f0018ce16e39872..6f7d1ffbb91a520506463328a13001304d815718 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -3090,11 +3090,12 @@ gchar *expand_search_string(const gchar *search_string)
        /* if it's a full command don't process it so users
           can still do something like from regexpcase "foo" */
        for (i = 0; cmds[i].command; i++) {
        /* if it's a full command don't process it so users
           can still do something like from regexpcase "foo" */
        for (i = 0; cmds[i].command; i++) {

+               gchar *tmp_search_string = search_string;

                cmd_start = cmds[i].command;
                /* allow logical NOT */
                cmd_start = cmds[i].command;
                /* allow logical NOT */

-               if (*search_string == '~')
-                       search_string++;
-               if (!strncmp(search_string, cmd_start, strlen(cmd_start)))
+               if (*tmp_search_string == '~')
+                       tmp_search_string++;
+               if (!strncmp(tmp_search_string, cmd_start, strlen(cmd_start)))

                        break;
        }
        if (cmds[i].command)
                        break;
        }
        if (cmds[i].command)