Changeset 442

Timestamp:

Jan 17, 2019, 7:12:23 PM (7 years ago)

Author:

pr

Message:

Revert previous attempt at fixing the quoting mess.

Files:

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

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

@@ -23 +23 @@
 
 /*
- *      Copyright (C) 1997-2016 Ulrich M”ller.
+ *      Copyright (C) 1997-2006 Ulrich M”ller.
  *      Parts Copyright (C) 1991-1999 iMatix Corporation.
  *      This file is part of the "XWorkplace helpers" source package.
@@ -1322 +1322 @@
  *@@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
- *@@changed WarpIN V1.0.23 (2016-09-23) [pr]: fix single quote handling and allow escaping @@fixes 1244
  */
 
@@ -1332 +1331 @@
            ulLength = strlen(pszSearchIn);
     BOOL   fInQuote = FALSE;
-    CHAR   cQuote = '\0', cPrev = '\0';
 
     // use alloca(), so memory is freed on function exit
@@ -1341 +1339 @@
     for (p = pszSearchIn2;   *p == '\'' || *p == '"'  || *p == ' '
                           || *p == '\n' || *p == '\r' || *p == '\t'; p++);
-    for (pszStart = p; *p; cPrev = *(p++))
+    for (pszStart = p; *p; p++)
     {
         if (fInQuote)
         {
             // V1.0.12 (2006-09-07) [pr]: allow end of line to terminate a (broken) quote
-            if ((*p == cQuote && cPrev != '\\') || *p == '\n' || *p == '\r')
+            if (*p == '"' || *p == '\n' || *p == '\r')
                 fInQuote = FALSE;
         }
         else
         {
-            if (*p == '"' || *p == '\'')
-            {
+            if (*p == '"')
                 fInQuote = TRUE;
-                cQuote = *p;
-            }
             else
             {
@@ -1453 +1448 @@
  *@@added V0.9.0 [umoeller]
  *@@changed V1.0.13 (2006-09-10) [pr]: improved parsing
- *@@changed WarpIN V1.0.23 (2016-09-23) [pr]: allow escaping @@fixes 1244
  */
 
@@ -1469 +1463 @@
     {
         // determine end character to search for: a space
-        CHAR cEnd = ' ', cPrev = '\0';
+        CHAR cEnd = ' ';
         // V1.0.3 (2004-11-10) [pr]: @@fixes 461
         // V1.0.13 (2006-09-10) [pr]: optimized
-        if ((*pParam == '"') || (*pParam == '\''))
+        if ((*pParam == '\"') || (*pParam == '\''))
         {
             // or, if the data is enclosed in quotes, a quote or single quote
@@ -1490 +1484 @@
             if (   (   (cEnd == ' ')
                     && ((*pParam == ' ') || (*pParam == '\r') || (*pParam == '\n')))
-                || ((*pParam == cEnd) && (cPrev != '\\'))
+                || (*pParam == cEnd)
                )
                 // end character found
@@ -1505 +1499 @@
                     break;
             }
-
             ulCount++;
-            cPrev = *(pParam++);
-        }
-
-        // copy attribute to new buffer, de-escaping if necessary
-        if (ulCount && (prc = (PSZ) malloc(ulCount+1)))
-        {
-            ULONG i = 0, j = 0;
-
-            for(cPrev = '\0'; i < ulCount; ++i, ++j)
-            {
-                if (cEnd != ' ' && pParam2[i] == cEnd && cPrev == '\\')
-                    --j;
-
-                cPrev = prc[j] = pParam2[i];
-            }
-
-            prc[j] = '\0';
+            pParam++;
+        }
+
+        // copy attribute to new buffer
+        if (ulCount)
+        {
+            prc = (PSZ)malloc(ulCount+1);
+            memcpy(prc, pParam2, ulCount);
+            *(prc+ulCount) = 0;
         }
     }

trunk/src/helpers/stringh.c

@@ -23 +23 @@
 
 /*
- *      Copyright (C) 1997-2016 Ulrich M”ller.
+ *      Copyright (C) 1997-2006 Ulrich M”ller.
  *      Parts Copyright (C) 1991-1999 iMatix Corporation.
  *      This file is part of the "XWorkplace helpers" source package.
@@ -1322 +1322 @@
  *@@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
- *@@changed WarpIN V1.0.23 (2016-09-23) [pr]: fix single quote handling and allow escaping @@fixes 1244
  */
 
@@ -1332 +1331 @@
            ulLength = strlen(pszSearchIn);
     BOOL   fInQuote = FALSE;
-    CHAR   cQuote = '\0', cPrev = '\0';
 
     // use alloca(), so memory is freed on function exit
@@ -1341 +1339 @@
     for (p = pszSearchIn2;   *p == '\'' || *p == '"'  || *p == ' '
                           || *p == '\n' || *p == '\r' || *p == '\t'; p++);
-    for (pszStart = p; *p; cPrev = *(p++))
+    for (pszStart = p; *p; p++)
     {
         if (fInQuote)
         {
             // V1.0.12 (2006-09-07) [pr]: allow end of line to terminate a (broken) quote
-            if ((*p == cQuote && cPrev != '\\') || *p == '\n' || *p == '\r')
+            if (*p == '"' || *p == '\n' || *p == '\r')
                 fInQuote = FALSE;
         }
         else
         {
-            if (*p == '"' || *p == '\'')
-            {
+            if (*p == '"')
                 fInQuote = TRUE;
-                cQuote = *p;
-            }
             else
             {
@@ -1453 +1448 @@
  *@@added V0.9.0 [umoeller]
  *@@changed V1.0.13 (2006-09-10) [pr]: improved parsing
- *@@changed WarpIN V1.0.23 (2016-09-23) [pr]: allow escaping @@fixes 1244
  */
 
@@ -1469 +1463 @@
     {
         // determine end character to search for: a space
-        CHAR cEnd = ' ', cPrev = '\0';
+        CHAR cEnd = ' ';
         // V1.0.3 (2004-11-10) [pr]: @@fixes 461
         // V1.0.13 (2006-09-10) [pr]: optimized
-        if ((*pParam == '"') || (*pParam == '\''))
+        if ((*pParam == '\"') || (*pParam == '\''))
         {
             // or, if the data is enclosed in quotes, a quote or single quote
@@ -1490 +1484 @@
             if (   (   (cEnd == ' ')
                     && ((*pParam == ' ') || (*pParam == '\r') || (*pParam == '\n')))
-                || ((*pParam == cEnd) && (cPrev != '\\'))
+                || (*pParam == cEnd)
                )
                 // end character found
@@ -1505 +1499 @@
                     break;
             }
-
             ulCount++;
-            cPrev = *(pParam++);
-        }
-
-        // copy attribute to new buffer, de-escaping if necessary
-        if (ulCount && (prc = (PSZ) malloc(ulCount+1)))
-        {
-            ULONG i = 0, j = 0;
-
-            for(cPrev = '\0'; i < ulCount; ++i, ++j)
-            {
-                if (cEnd != ' ' && pParam2[i] == cEnd && cPrev == '\\')
-                    --j;
-
-                cPrev = prc[j] = pParam2[i];
-            }
-
-            prc[j] = '\0';
+            pParam++;
+        }
+
+        // copy attribute to new buffer
+        if (ulCount)
+        {
+            prc = (PSZ)malloc(ulCount+1);
+            memcpy(prc, pParam2, ulCount);
+            *(prc+ulCount) = 0;
         }
     }