[Xfce4-commits] r22606 - xarchiver/trunk/src

[Giuseppe Torelli]

Author: colossus
Date: 2006-08-01 12:05:11 +0000 (Tue, 01 Aug 2006)
New Revision: 22606

Modified:
   xarchiver/trunk/src/callbacks.c
Log:
Finally fixed the [ ] bug.


Modified: xarchiver/trunk/src/callbacks.c
===================================================================
--- xarchiver/trunk/src/callbacks.c     2006-08-01 11:32:38 UTC (rev 22605)
+++ xarchiver/trunk/src/callbacks.c     2006-08-01 12:05:11 UTC (rev 22606)
@@ -1435,8 +1435,6 @@
         case '|':
         case '`':
         case '!':
-               case '[':
-               case ']':
         return 1;
         default:
         return 0;
@@ -1453,11 +1451,9 @@
        while (*p != '\000')
        {
         if (is_escaped_char(*p))
-               {
                        escapechars++;
-                       if ( doublesquare && (*p == '[' || *p == ']') )
-                               escapechars++;
-               }
+               else if ( doublesquare && (*p == '[' || *p == ']') )
+                       escapechars += 2;
                p++;
     }
 
@@ -1471,10 +1467,11 @@
        while (*p != '\000')
        {
         if (is_escaped_char(*p))
+                       *q++ = '\\';
+               else if ( doublesquare && (*p == '[' || *p == ']') )
                {
-                       if ( doublesquare && (*p == '[' || *p == ']') )
-                               *q++ = '\\';
                        *q++ = '\\';
+                       *q++ = '\\';
                }
                *q++ = *p++;
        }

_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits