Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/edje

Dir     : e17/libs/edje/src/bin


Modified Files:
        edje_cc_parse.c 


Log Message:


fix escape handling in quotes! :)

===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_parse.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- edje_cc_parse.c     27 Dec 2005 17:17:31 -0000      1.40
+++ edje_cc_parse.c     13 Aug 2006 10:37:04 -0000      1.41
@@ -339,12 +339,11 @@
        
        while (*p)
          {
-            if (*p == '"')
-              memmove(p, p + 1, strlen(p));
-            else if ((*p == '\\') && (*(p + 1) == '"'))
-              memmove(p, p + 1, strlen(p));
-            else if ((*p == '\\') && (*(p + 1) == '\\'))
-              memmove(p, p + 1, strlen(p));
+            if ((*p == '\"') && 
+                ((p == tok) || ((p > tok) && (*(p - 1) != '\\'))))
+              {
+                 memmove(p, p + 1, strlen(p));
+              }
             else if ((*p == '\\') && (*(p + 1) == 'n'))
               {
                  memmove(p, p + 1, strlen(p));
@@ -354,6 +353,12 @@
               {
                  memmove(p, p + 1, strlen(p));
                  *p = '\t';
+              }
+            else if (*p == '\\')
+              {
+                 memmove(p, p + 1, strlen(p));
+                 p++;
+                 if (*p == '\\') p++;
               }
             else
               p++;



-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to