escaping of string is fixed

diff --git a/ChangeLog.claws b/ChangeLog.claws
index b7da720741691bd1c9eb00f9a932fced5205fde6..aa363172bbe84d3c5a822b27cddc0fa6449dd852 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -2,6 +2,8 @@
 
        * src/quote_fmt_parse.y
                Fixed a yacc/bison syntax error
+       * src/matcher.c
+               Escaping of string is fixed.
 
 2002-10-11 [colin]     0.8.5claws12
 

diff --git a/src/matcher.c b/src/matcher.c
index b9288ce0c14037c255ed026c8e20a4702b8e149f..4c8f7c864dafc5638fa0bdd3f9155de7f716d71c 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -140,7 +140,7 @@ gchar *matcher_escape_str(const gchar *str)
                return NULL;
 
        for (escape = 0, walk = str; *walk; walk++)
-               if (*walk == '\'' || *walk == '\"')
+               if (*walk == '\\' || *walk == '\"' || *walk == '\"')
                        escape++;
 
        if (!escape)
@@ -148,7 +148,7 @@ gchar *matcher_escape_str(const gchar *str)
        
        reswalk = res = g_new0(gchar, (walk - str) + escape + 1);
        for (walk = str; *walk; walk++, reswalk++) {
-               if (*walk == '\'' || *walk == '\"')
+               if (*walk == '\\' || *walk == '\'' || *walk == '\"')
                        *reswalk++ = '\\';
                *reswalk = *walk;
        }
@@ -173,9 +173,7 @@ gchar *matcher_unescape_str(gchar *str)
                        *dst++ = *src;
                else {
                        src++;
-                       if (*src == '\\')
-                               *dst++ = '\\';                          /* insert backslash */
-                       else if (*src == 'n')                           /* insert control characters */
+                        if (*src == 'n')   /* insert control characters */
                                *dst++ = '\n';
                        else if (*src == 'r') 
                                *dst++ = '\r';
@@ -187,7 +185,8 @@ gchar *matcher_unescape_str(gchar *str)
                                *dst++ = '\b';
                        else if (*src == 'f')
                                *dst++ = '\f';
-                       else if (*src == '\'' || *src == '\"')          /* insert \' or \" */
+                       else if (*src == '\\' || *src == '\'' || *src == '\"')
+                                /* insert \\, \' or \" */
                                *dst++ = *src;
                        else {
                                /* FIXME: should perhaps escape character... */