Changeset 427

Timestamp:

Sep 26, 2016, 1:46:17 PM (9 years ago)

Author:

pr

Message:

Fix quoting and allow escapes. Bug 1244.

File:

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

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

@@ -23 +23 @@
 
 /*
- *      Copyright (C) 1997-2006 Ulrich M”ller.
+ *      Copyright (C) 1997-2016 Ulrich M”ller.
  *      Parts Copyright (C) 1991-1999 iMatix Corporation.
  *      This file is part of the "XWorkplace helpers" source package.
@@ -180 +180 @@
 }
 
+/*
+ *@@ strhCopyBuf:
+ *      copies pcszSource to pszTarget, taking
+ *      its length into account.
+ *
+ *      Returns:
+ *
+ *      --  NO_ERROR
+ *
+ *      --  ERROR_INVALID_PARAMETER: pcszSource is
+ *          null or points to a null byte.
+ *
+ *      --  ERROR_FILENAME_EXCED_RANGE: pcszSource
+ *          is too long to fit into pszTarget.
+ *
+ *@@added V1.0.1 (2003-01-05) [umoeller]
+ */
+
+APIRET strhCopyBuf(PSZ pszTarget,
+                   PCSZ pcszSource,
+                   ULONG cbTarget)
+{
+    ULONG cb;
+    if (!pcszSource || !*pcszSource)
+        return ERROR_INVALID_PARAMETER;
+    cb = strlen(pcszSource) + 1;
+    if (cb > cbTarget)
+        return ERROR_FILENAME_EXCED_RANGE;
+
+    memcpy(pszTarget,
+           pcszSource,
+           cb);
+    return NO_ERROR;
+}
+
 #ifdef __DEBUG_MALLOC_ENABLED__
 
@@ -220 +255 @@
  *@@ strhdup:
  *      like strdup, but this one doesn't crash if pszSource
- *      is NULL, but returns NULL also. In addition, this
+ *      is NULL. Instead, this returns NULL if pcszSource is
+ *      NULL or points to a null byte. In addition, this
  *      can report the length of the string (V0.9.16).
  *
@@ -376 +412 @@
 
 /*
+ *@@ strlcpy:
+ *      copies src to string dst of size siz.  At most siz-1 characters
+ *      will be copied.  Always NUL terminates, unless siz == 0.
+ *
+ *      Returns strlen(src); if retval >= siz, truncation occurred.
+ *
+ *      Taken from the OpenBSD sources at
+ *
+ +          ftp://ftp.openbsd.org/pub/OpenBSD/src/lib/libc/string/strlcpy.c
+ *
+ *      Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *      All rights reserved.
+ *
+ *      OpenBSD licence applies (see top of that file).
+ *
+ *@@added V1.0.1 (2003-01-29) [umoeller]
+ */
+
+size_t strlcpy(char *dst,
+               const char *src,
+               size_t siz)
+{
+    register char       *d = dst;
+    register const char *s = src;
+    register size_t     n = siz;
+
+    /* Copy as many bytes as will fit */
+    if (n != 0 && --n != 0)
+    {
+        do
+        {
+            if ((*d++ = *s++) == 0)
+                break;
+        } while (--n != 0);
+    }
+
+    /* Not enough room in dst, add NUL and traverse rest of src */
+    if (n == 0)
+    {
+        if (siz != 0)
+            *d = '\0';      /* NUL-terminate dst */
+        while (*s++)
+            ;
+    }
+
+    return (s - src - 1);    /* count does not include NUL */
+}
+
+/*
+ *@@ strlcat:
+ *      appends src to string dst of size siz. Unlike strncat,
+ *      siz is the full size of dst, not space left. At most
+ *      siz-1 characters will be copied.  Always NUL terminates,
+ *      unless siz <= strlen(dst).
+ *
+ *      Returns strlen(src) + MIN(siz, strlen(initial dst)),
+ *      in other words, strlen(dst) after the concatenation.
+ *      If retval >= siz, truncation occurred.
+ *
+ *      Taken from the OpenBSD sources at
+ *
+ +          ftp://ftp.openbsd.org/pub/OpenBSD/src/lib/libc/string/strlcat.c
+ *
+ *      Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *      All rights reserved.
+ *
+ *      OpenBSD licence applies (see top of that file).
+ *
+ *@@added V1.0.1 (2003-01-29) [umoeller]
+ */
+
+size_t strlcat(char *dst,
+               const char *src,
+               size_t siz)
+{
+    register char       *d = dst;
+    register const char *s = src;
+    register size_t     n = siz;
+    size_t              dlen;
+
+    /* Find the end of dst and adjust bytes left but don't go past end */
+    while (n-- != 0 && *d != '\0')
+        d++;
+    dlen = d - dst;
+    n = siz - dlen;
+
+    if (n == 0)
+        return(dlen + strlen(s));
+    while (*s != '\0')
+    {
+        if (n != 1)
+        {
+            *d++ = *s;
+            n--;
+        }
+        s++;
+    }
+    *d = '\0';
+
+    return (dlen + (s - src));   /* count does not include NUL */
+}
+
+/*
  *@@ strhlen:
  *      like strlen, but doesn't crash on
@@ -407 +546 @@
 {
     if (pcsz) //  && *pcsz) // V0.9.18 (2002-03-27) [umoeller]
-        return (strlen(pcsz) + 1);
+        return strlen(pcsz) + 1;
 
     return 0;
@@ -420 +559 @@
                 CHAR c)
 {
-    PSZ         p = (PSZ)pszSearch;
-    ULONG       ulCount = 0;
+    PCSZ    p = pszSearch;
+    ULONG   ulCount = 0;
     while (TRUE)
     {
-        p = strchr(p, c);
-        if (p)
-        {
-            ulCount++;
-            p++;
-        }
-        else
-            break;
-    }
-    return ulCount;
+        if (!(p = strchr(p, c)))
+            return ulCount;
+
+        ulCount++;
+        p++;
+    }
 }
 
@@ -1028 +1163 @@
         *pulOffset = prc - pcszSearchIn;
 
-    return ((PSZ)prc);
+    return (PSZ)prc;
 }
 
@@ -1131 +1266 @@
 
 /*
+ *@@ strhKillChar:
+ *      removes the first occurence of c in psz
+ *      by overwriting it with the following characters.
+ *
+ *      For this to work, you _must_ pass in strlen(psz)
+ *      in the ULONG pointed to by ulLength. If
+ *
+ *      Returns TRUE only if c was actually found. In
+ *      that case, *pulLength is decremented.
+ *
+ *@@added V1.0.1 (2003-01-30) [umoeller]
+ */
+
+BOOL strhKillChar(PSZ psz,
+                  CHAR c,
+                  PULONG pulLength)
+{
+    PSZ p;
+    if (p = strchr(psz, c))
+    {
+        // "string~rest"
+        //  ÀÄÄÄÄÄÙ 6 chars (p - pszBuf)
+        //  ÀÄÄÄÄÄÄÄÄÄÄÙ 11 chars (ulLen)
+        //        ^ p (pszBuf + 6)
+        //  ^ pszBuf
+        memmove(p,                      // pszBuf + 6
+                p + 1,                  // pszBuf + 7
+                // include null byte
+                  *pulLength            // 11
+                - (p - psz));           // - 6 = 5
+        --(*pulLength);
+
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+/*
  * strhFindAttribValue:
  *      searches for pszAttrib in pszSearchIn; if found,
@@ -1148 +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
  */
 
@@ -1157 +1332 @@
            ulLength = strlen(pszSearchIn);
     BOOL   fInQuote = FALSE;
+    CHAR   cQuote = '\0', cPrev = '\0';
 
     // use alloca(), so memory is freed on function exit
@@ -1165 +1341 @@
     for (p = pszSearchIn2;   *p == '\'' || *p == '"'  || *p == ' '
                           || *p == '\n' || *p == '\r' || *p == '\t'; p++);
-    for (pszStart = p; *p; p++)
+    for (pszStart = p; *p; cPrev = *(p++))
     {
         if (fInQuote)
         {
             // V1.0.12 (2006-09-07) [pr]: allow end of line to terminate a (broken) quote
-            if (*p == '"' || *p == '\n' || *p == '\r')
+            if ((*p == cQuote && cPrev != '\\') || *p == '\n' || *p == '\r')
                 fInQuote = FALSE;
         }
         else
         {
-            if (*p == '"')
+            if (*p == '"' || *p == '\'')
+            {
                 fInQuote = TRUE;
+                cQuote = *p;
+            }
             else
             {
@@ -1274 +1453 @@
  *@@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
  */
 
@@ -1289 +1469 @@
     {
         // determine end character to search for: a space
-        CHAR cEnd = ' ';
+        CHAR cEnd = ' ', cPrev = '\0';
         // 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
@@ -1310 +1490 @@
             if (   (   (cEnd == ' ')
                     && ((*pParam == ' ') || (*pParam == '\r') || (*pParam == '\n')))
-                || (*pParam == cEnd)
+                || ((*pParam == cEnd) && (cPrev != '\\'))
                )
                 // end character found
@@ -1325 +1505 @@
                     break;
             }
+
             ulCount++;
-            pParam++;
-        }
-
-        // copy attribute to new buffer
-        if (ulCount)
-        {
-            prc = (PSZ)malloc(ulCount+1);
-            memcpy(prc, pParam2, ulCount);
-            *(prc+ulCount) = 0;
+            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';
         }
     }
@@ -1831 +2020 @@
 
     if (pattern_size == 0)              //  Empty patterns match at start
-        return ((void *)block);
+        return (void*)block;
 
     //  Build the shift table unless we're continuing a previous search
@@ -1877 +2066 @@
             // If we found a match, return the start address
             if (match_size >= pattern_size)
-                return ((void*)(match_base));
+                return (void*)match_base;
 
         }
@@ -1935 +2124 @@
 
     if (pattern_size == 0)              //  Empty string matches at start
-        return (char *) string;
+        return (char*)string;
 
     //  Build the shift table
@@ -1973 +2162 @@
             //  If we found a match, return the start address
             if (match_size >= pattern_size)
-                return ((char *)(match_base));
+                return (char*)match_base;
           }
       }
+
     return NULL;                      //  Found nothing
 }
 
+