Changeset 249 for trunk/src/helpers/xstring.c

Timestamp:

Feb 8, 2003, 9:57:38 PM (23 years ago)

Author:

umoeller

Message:

Build updates, moved files from warpin.

File:

• trunk/src/helpers/xstring.c (modified) (3 diffs)

trunk/src/helpers/xstring.c

@@ -1258 +1258 @@
 
 // static encoding table for xstrEncode
-STATIC PSZ apszEncoding[] =
+static PSZ apszEncoding[] =
 {
     "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07",
@@ -1365 +1365 @@
                         // use the static encoding table for speed
                         memcpy(pszDestCurr,
-                               apszEncoding[(unsigned char)pcszEncode[ulEncode]],
+                               apszEncoding[(UCHAR)pcszEncode[ulEncode]],
                                3);
                         pszDestCurr += 3;
@@ -1385 +1385 @@
             *pszDestCurr = 0;
 
-            xstrcpy(pxstr, pszDest, pszDestCurr-pszDest);
+            xstrcpy(pxstr, pszDest, pszDestCurr - pszDest);
+        }
+
+        free(pszDest);
+    }
+
+    return ulrc;
+}
+
+/*
+ *@@ xstrEncodeASCII:
+ *      like xstrEncode, but instead of encoding characters
+ *      from an array given by the caller, this encodes all
+ *      non-ASCII characters (i.e. >= 128) plus the '%' char.
+ *
+ *@@added V1.0.2 (2003-02-07) [umoeller]
+ */
+
+ULONG xstrEncodeASCII(PXSTRING pxstr)     // in/out: string to convert
+{
+    ULONG ulrc = 0,
+          ul,
+          ulEncodeLength;
+
+    if (    (pxstr)
+         && (pxstr->ulLength)
+       )
+    {
+        PSZ pszDest = (PSZ)malloc(pxstr->ulLength * 3
+                                  + 1),
+            pszDestCurr = pszDest;
+
+        if (pszDest)
+        {
+            for (ul = 0;
+                 ul < pxstr->ulLength;
+                 ul++)
+            {
+                if (    ((UCHAR)pxstr->psz[ul] >= 128)
+                     || (pxstr->psz[ul] == '%')
+                   )
+                {
+                    memcpy(pszDestCurr,
+                           apszEncoding[(UCHAR)pxstr->psz[ul]],
+                           3);
+                    pszDestCurr += 3;
+                    ulrc++;
+                    goto iterate;
+                }
+
+                *pszDestCurr++ = pxstr->psz[ul];
+
+                iterate:
+                    ;
+            }
+        }
+
+        // something was encoded; update pxstr
+        if (ulrc)
+        {
+            *pszDestCurr = 0;
+
+            xstrcpy(pxstr, pszDest, pszDestCurr - pszDest);
         }