Changeset 332

Timestamp:

Sep 7, 2006, 1:59:59 PM (19 years ago)

Author:

pr

Message:

Fixes bug 718/836

Files:

• branches/branch-1-0/src/helpers/stringh.c (modified) (2 diffs)
• trunk/src/helpers/stringh.c (modified) (2 diffs)

branches/branch-1-0/src/helpers/stringh.c

@@ -1147 +1147 @@
  *@@changed V0.9.12 (2001-05-22) [umoeller]: fixed space bug, thanks Yuri Dario
  *@@changed WarpIN V1.0.11 (2006-08-29) [pr]: handle attrib names in quoted strings @@fixes 718
+ *@@changed WarpIN V1.0.12 (2006-09-07) [pr]: fix attrib handling again @@fixes 718 @@fixes 836
  */
 
@@ -1161 +1162 @@
     memcpy(pszSearchIn2, pszSearchIn, ulLength + 1);
 
-    for (p = pszSearchIn2; *p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'; p++);
+    // V1.0.12 (2006-09-07) [pr]: filter leading " and ' left over from the previous pass
+    for (p = pszSearchIn2;   *p == '\'' || *p == '"'  || *p == ' '
+                          || *p == '\n' || *p == '\r' || *p == '\t'; p++);
     for (pszStart = p; *p; p++)
     {
         if (fInQuote)
         {
-            if (*p == '"')
+            // V1.0.12 (2006-09-07) [pr]: allow end of line to terminate a (broken) quote
+            if (*p == '"' || *p == '\n' || *p == '\r')
                 fInQuote = FALSE;
         }

trunk/src/helpers/stringh.c

@@ -1321 +1321 @@
  *@@changed V0.9.12 (2001-05-22) [umoeller]: fixed space bug, thanks Yuri Dario
  *@@changed WarpIN V1.0.11 (2006-08-29) [pr]: handle attrib names in quoted strings @@fixes 718
+ *@@changed WarpIN V1.0.12 (2006-09-07) [pr]: fix attrib handling again @@fixes 718 @@fixes 836
  */
 
@@ -1335 +1336 @@
     memcpy(pszSearchIn2, pszSearchIn, ulLength + 1);
 
-    for (p = pszSearchIn2; *p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'; p++);
+    // V1.0.12 (2006-09-07) [pr]: filter leading " and ' left over from the previous pass
+    for (p = pszSearchIn2;   *p == '\'' || *p == '"'  || *p == ' '
+                          || *p == '\n' || *p == '\r' || *p == '\t'; p++);
     for (pszStart = p; *p; p++)
     {
         if (fInQuote)
         {
-            if (*p == '"')
+            // V1.0.12 (2006-09-07) [pr]: allow end of line to terminate a (broken) quote
+            if (*p == '"' || *p == '\n' || *p == '\r')
                 fInQuote = FALSE;
         }