Changeset 329 for branches

Timestamp:

Aug 31, 2006, 11:23:54 PM (19 years ago)

Author:

pr

Message:

Fixes bug 718

File:

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

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

@@ -23 +23 @@
 
 /*
- *      Copyright (C) 1997-2002 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.
@@ -1146 +1146 @@
  *@@changed V0.9.3 (2000-05-19) [umoeller]: some speed optimizations
  *@@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
  */
 
 PSZ strhFindAttribValue(const char *pszSearchIn, const char *pszAttrib)
 {
-   PSZ    prc = 0;
-   PSZ    pszSearchIn2, p;
-   ULONG  cbAttrib = strlen(pszAttrib),
-          ulLength = strlen(pszSearchIn);
-
-   // use alloca(), so memory is freed on function exit
-   pszSearchIn2 = (PSZ)alloca(ulLength + 1);
-   memcpy(pszSearchIn2, pszSearchIn, ulLength + 1);
-
-   // 1) find token, (space char, \n, \r, \t)
-   p = strtok(pszSearchIn2, " \n\r\t");
-   while (p)
-   {
-        CHAR c2;
-        PSZ pOrig;
-
-        // check tag name
-        if (!strnicmp(p, pszAttrib, cbAttrib))
-        {
-            // position in original string
-            pOrig = (PSZ)pszSearchIn + (p - pszSearchIn2);
-
-            // yes:
-            prc = pOrig + cbAttrib;
-            c2 = *prc;
-            while (   (   (c2 == ' ')
-                       || (c2 == '=')
-                       || (c2 == '\n')
-                       || (c2 == '\r')
-                      )
-                    && (c2 != 0)
-                  )
-                c2 = *++prc;
-
-            break;
-        }
-
-        p = strtok(NULL, " \n\r\t");
-   }
-
-   return prc;
-}
-
-/* PSZ strhFindAttribValue(const char *pszSearchIn, const char *pszAttrib)
-{
-    PSZ     prc = 0;
-    PSZ     pszSearchIn2 = (PSZ)pszSearchIn,
-            p,
-            p2;
-    ULONG   cbAttrib = strlen(pszAttrib);
-
-    // 1) find space char
-    while ((p = strchr(pszSearchIn2, ' ')))
-    {
-        CHAR c;
-        p++;
-        if (strlen(p) >= cbAttrib)      // V0.9.9 (2001-03-27) [umoeller]
-        {
-            c = *(p+cbAttrib);     // V0.9.3 (2000-05-19) [umoeller]
-            // now check whether the p+strlen(pszAttrib)
-            // is a valid end-of-tag character
-            if (    (memicmp(p, (PVOID)pszAttrib, cbAttrib) == 0)
-                 && (   (c == ' ')
-                     || (c == '>')
-                     || (c == '=')
-                     || (c == '\r')
-                     || (c == '\n')
-                     || (c == 0)
-                    )
-               )
+    PSZ    prc = 0;
+    PSZ    pszSearchIn2, p, pszStart, pszName, pszValue;
+    ULONG  cbAttrib = strlen(pszAttrib),
+           ulLength = strlen(pszSearchIn);
+    BOOL   fInQuote = FALSE;
+
+    // use alloca(), so memory is freed on function exit
+    pszSearchIn2 = (PSZ)alloca(ulLength + 1);
+    memcpy(pszSearchIn2, pszSearchIn, ulLength + 1);
+
+    for (p = pszSearchIn2; *p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'; p++);
+    for (pszStart = p; *p; p++)
+    {
+        if (fInQuote)
+        {
+            if (*p == '"')
+                fInQuote = FALSE;
+        }
+        else
+        {
+            if (*p == '"')
+                fInQuote = TRUE;
+            else
             {
-                // yes:
-                CHAR c2;
-                p2 = p + cbAttrib;
-                c2 = *p2;
-                while (     (   (c2 == ' ')
-                             || (c2 == '=')
-                             || (c2 == '\n')
-                             || (c2 == '\r')
-                            )
-                        &&  (c2 != 0)
-                      )
-                    c2 = *++p2;
-
-                prc = p2;
-                break; // first while
+                if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
+                {
+                    *p = '\0';
+                    pszName = strtok(pszStart, "=>");
+                    pszStart = p + 1;
+                    if (pszName && !stricmp(pszName, pszAttrib))
+                    {
+                        pszValue = strtok(NULL, "");
+                        if (pszValue)
+                            prc = (PSZ)pszSearchIn + (pszValue - pszSearchIn2);
+                        else
+                            prc = (PSZ)pszSearchIn + (pszName - pszSearchIn2) + cbAttrib;
+
+                        return(prc);
+                    }
+                }
             }
         }
-        else
-            break;
-
-        pszSearchIn2++;
-    }
+    }
+
+    if (pszStart != p)
+    {
+        pszName = strtok(pszStart, "=>");
+        if (pszName && !stricmp(pszName, pszAttrib))
+        {
+            pszValue = strtok(NULL, "");
+            if (pszValue)
+                prc = (PSZ)pszSearchIn + (pszValue - pszSearchIn2);
+            else
+                prc = (PSZ)pszSearchIn + (pszName - pszSearchIn2) + cbAttrib;
+        }
+    }
+
     return prc;
-} */
+}
 
 /*