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

Timestamp:

Feb 17, 2001, 3:03:14 PM (25 years ago)

Author:

umoeller

Message:

Updates to XML.

File:

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

trunk/src/helpers/xstring.c

@@ -346 +346 @@
  *
  *@@added V0.9.6 (2000-11-01) [umoeller]
+ *@@changed V0.9.9 (2001-02-14) [umoeller]: fixed NULL target crash
  */
 
@@ -351 +352 @@
               PSZ pszNew)                   // in: heap PSZ to use
 {
+    if (!pxstr)
+        return (0);         // V0.9.9 (2001-02-14) [umoeller]
+
     xstrClear(pxstr);
     pxstr->psz = pszNew;
@@ -391 +395 @@
  *@@changed V0.9.7 (2001-01-15) [umoeller]: added ulSourceLength
  *@@changed V0.9.9 (2001-01-28) [lafaix]: fixed memory leak and NULL source behavior
+ *@@changed V0.9.9 (2001-02-14) [umoeller]: fixed NULL target crash
  */
 
@@ -399 +404 @@
     // xstrClear(pxstr);        NOOOO! this frees the string, we want to keep the memory
 
-    if (pxstr)
-    {
-        if (pcszSource)
+    if (!pxstr)
+        return (0);         // V0.9.9 (2001-02-14) [umoeller]
+
+    if (pcszSource)
+    {
+        // source specified:
+        if (ulSourceLength == 0)
+            // but not length:
+            ulSourceLength = strlen(pcszSource);
+    }
+    else
+        ulSourceLength = 0;
+
+    if (ulSourceLength)
+    {
+        // we do have a source string:
+        ULONG cbNeeded = ulSourceLength + 1;
+        if (cbNeeded > pxstr->cbAllocated)
         {
-            // source specified:
-            if (ulSourceLength == 0)
-                // but not length:
-                ulSourceLength = strlen(pcszSource);
+            // we need more memory than we have previously
+            // allocated:
+            if (pxstr->psz)
+                free(pxstr->psz); // V0.9.9 (2001-01-28) [lafaix]
+            pxstr->cbAllocated = cbNeeded;
+            pxstr->psz = (PSZ)malloc(cbNeeded);
         }
-        else
-            ulSourceLength = 0;
-
-        if (ulSourceLength)
-        {
-            // we do have a source string:
-            ULONG cbNeeded = ulSourceLength + 1;
-            if (cbNeeded > pxstr->cbAllocated)
-            {
-                // we need more memory than we have previously
-                // allocated:
-                if (pxstr->psz)
-                    free(pxstr->psz); // V0.9.9 (2001-01-28) [lafaix]
-                pxstr->cbAllocated = cbNeeded;
-                pxstr->psz = (PSZ)malloc(cbNeeded);
-            }
-            // else: we have enough memory
-
-            // strcpy(pxstr->psz, pcszSource);
-            memcpy(pxstr->psz,
-                   pcszSource,
-                   ulSourceLength + 1); // V0.9.9 (2001-01-31) [umoeller]
-        }
-        else
-        {
-            // no source specified or source is empty:
-            if (pxstr->cbAllocated)
-                // we did have a string: set to empty,
-                // but leave allocated memory intact
-                *(pxstr->psz) = 0;
-            // else
-                // we had no string previously: in that case
-                // psz and ulLength and cbAllocated are all still NULL
-        }
-
-        // in all cases, set new length
-        pxstr->ulLength = ulSourceLength;
-    }
+        // else: we have enough memory
+
+        // strcpy(pxstr->psz, pcszSource);
+        memcpy(pxstr->psz,
+               pcszSource,
+               ulSourceLength + 1); // V0.9.9 (2001-01-31) [umoeller]
+    }
+    else
+    {
+        // no source specified or source is empty:
+        if (pxstr->cbAllocated)
+            // we did have a string: set to empty,
+            // but leave allocated memory intact
+            *(pxstr->psz) = 0;
+        // else
+            // we had no string previously: in that case
+            // psz and ulLength and cbAllocated are all still NULL
+    }
+
+    // in all cases, set new length
+    pxstr->ulLength = ulSourceLength;
 
     return (pxstr->ulLength);
+}
+
+/*
+ *@@ xstrcpys:
+ *      shortcut to xstrcpy if the source is an XSTRING also.
+ *
+ *@@added V0.9.9 (2001-02-14) [umoeller]
+ */
+
+ULONG xstrcpys(PXSTRING pxstr,
+               const XSTRING *pcstrSource)
+{
+    if (!pcstrSource)
+        return (0);
+
+    return (xstrcpy(pxstr, pcstrSource->psz, pcstrSource->ulLength));
 }
 
@@ -634 +655 @@
 
 /*
+ *@@ xstrcats:
+ *      shortcut to xstrcat if the source is an XSTRING also.
+ *
+ *@@added V0.9.9 (2001-02-14) [umoeller]
+ */
+
+ULONG xstrcats(PXSTRING pxstr,
+               const XSTRING *pcstrSource)
+{
+    if (!pcstrSource)
+        return (0);
+
+    return (xstrcat(pxstr, pcstrSource->psz, pcstrSource->ulLength));
+}
+
+/*
  *@@ xstrrpl:
  *      replaces cReplLen characters in pxstr, starting
@@ -666 +703 @@
  *@@added V0.9.7 (2001-01-15) [umoeller]
  *@@changed V0.9.9 (2001-01-29) [lafaix]: fixed unnecessary allocation when pxstr was big enough
+  *@@changed V0.9.9 (2001-02-14) [umoeller]: fixed NULL target crash
  */
 
@@ -676 +714 @@
 
     // security checks...
-    if (    (ulFirstReplOfs + cReplLen <= pxstr->ulLength)
+    if (    (pxstr)         // V0.9.9 (2001-02-14) [umoeller]
+         && (ulFirstReplOfs + cReplLen <= pxstr->ulLength)
          && (pstrReplaceWith)
          // && (pstrReplaceWith->ulLength)      no, this can be empty
@@ -747 +786 @@
             ULONG   cTailLength = pxstr->ulLength - ulFirstReplOfs - cReplLen;
 
-            // first, we move the end to its new location (memmove
-            // handles overlap if needed)
+            // first, we move the end to its new location
+            // (memmove handles overlap if needed)
             memmove(pFound + cReplaceLen,
                     pFound + cReplLen,
@@ -787 +826 @@
  *
  *@@added V0.9.6 (2000-11-12) [umoeller]
+ *@@changed V0.9.9 (2001-02-14) [umoeller]: fixed NULL string crashs
  */
 
@@ -798 +838 @@
 {
     PSZ     pReturn = 0;
-    ULONG   ulFoundLen = pstrFind->ulLength;
-
-    if ((pxstr->ulLength) && (ulFoundLen))
-    {
-        const char *p = pxstr->psz + ulOfs;
-
-        do  // while p
+
+    if (pxstr && pstrFind)      // V0.9.9 (2001-02-14) [umoeller]
+    {
+        ULONG   ulFoundLen = pstrFind->ulLength;
+
+        if ((pxstr->ulLength) && (ulFoundLen))
         {
-            // p = strstr(p, pstrFind->psz);
-            p = (PSZ)strhmemfind(p,         // in: haystack
-                                 pxstr->ulLength - (p - pxstr->psz),
-                                            // remaining length of haystack
-                                 pstrFind->psz,
-                                 ulFoundLen,
-                                 pShiftTable,
-                                 pfRepeatFind);
-            if (p)
+            const char *p = pxstr->psz + ulOfs;
+
+            do  // while p
             {
-                // string found:
-                // check if that's a word
-
-                if (strhIsWord(pxstr->psz,
-                               p,
-                               ulFoundLen,
-                               pcszBeginChars,
-                               pcszEndChars))
+                p = (PSZ)strhmemfind(p,         // in: haystack
+                                     pxstr->ulLength - (p - pxstr->psz),
+                                                // remaining length of haystack
+                                     pstrFind->psz,
+                                     ulFoundLen,
+                                     pShiftTable,
+                                     pfRepeatFind);
+                if (p)
                 {
-                    // valid end char:
-                    pReturn = (PSZ)p;
-                    break;
+                    // string found:
+                    // check if that's a word
+
+                    if (strhIsWord(pxstr->psz,
+                                   p,
+                                   ulFoundLen,
+                                   pcszBeginChars,
+                                   pcszEndChars))
+                    {
+                        // valid end char:
+                        pReturn = (PSZ)p;
+                        break;
+                    }
+
+                    p += ulFoundLen;
                 }
-
-                p += ulFoundLen;
-            }
-        } while (p);
-
-    }
+            } while (p);
+
+        }
+    }
+
     return (pReturn);
 }