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

Timestamp:

Apr 25, 2001, 8:55:35 PM (24 years ago)

Author:

umoeller

Message:

Misc. fixes.

File:

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

trunk/src/helpers/xstring.c

@@ -690 +690 @@
 /*
  *@@ xstrrpl:
- *      replaces cReplLen characters in pxstr, starting
- *      at the position ulFirstReplPos, with the string
- *      in pxstrReplaceWith.
+ *      replaces "cReplLen" characters in pxstr, starting
+ *      at the position "ulFirstReplPos", with the first
+ *      "cReplaceWithLen" characters from pcszReplaceWith.
  *
  *      Returns the new length of the string, excluding
@@ -727 +727 @@
  *@@changed V0.9.9 (2001-02-14) [umoeller]: fixed NULL target crash
  *@@changed V0.9.9 (2001-03-09) [umoeller]: now using xstrReserve
+ *@@changed V0.9.11 (2001-04-22) [umoeller]: replaced replacement XSTRING with PCSZ
  */
 
@@ -732 +733 @@
               ULONG ulFirstReplOfs,             // in: ofs of first char to replace
               ULONG cReplLen,                   // in: no. of chars to replace
-              const XSTRING *pstrReplaceWith)   // in: string to replace chars with
+              const char *pcszReplaceWith,      // in: string to replace chars with
+              ULONG cReplaceWithLen)            // in: length of replacement string
+                                                // (this MUST be specified; if 0, chars are removed only)
 {
     ULONG   ulrc = 0;
@@ -739 +742 @@
     if (    (pxstr)         // V0.9.9 (2001-02-14) [umoeller]
          && (ulFirstReplOfs + cReplLen <= pxstr->ulLength)
-         && (pstrReplaceWith)
-         // && (pstrReplaceWith->ulLength)      no, this can be empty
+         && (pcszReplaceWith)
        )
     {
-        ULONG   cReplaceLen = pstrReplaceWith->ulLength;
-                    // can be 0!
-
         // size of new buffer:
-        ULONG   cbNeeded = pxstr->ulLength
-                         + cReplaceLen
-                         - cReplLen
-                         + 1;                  // null terminator
+        ULONG   cbNeeded = pxstr->ulLength      // existing
+                         + cReplaceWithLen      // plus replacement string length
+                         - cReplLen             // minus replaced characters
+                         + 1;                   // plus null terminator
         // offset where pszSearch was found
         PSZ     pFound = pxstr->psz + ulFirstReplOfs;
@@ -791 +790 @@
                        ulFirstReplOfs);     // up to "found"
 
-            if (cReplaceLen)
+            if (cReplaceWithLen)
             {
                 // we have a replacement:
                 // insert it next
+
+                /* memcpy(pszNew + ulFirstReplOfs,
+                       pstrReplaceWith->psz,
+                       cReplaceWithLen + 1);        // include null terminator
+                */
+                // no, we no longer can be sure that pcszReplaceWith is
+                // null terminated, so terminate explicitly
+                // V0.9.11 (2001-04-22) [umoeller]
+
                 memcpy(pszNew + ulFirstReplOfs,
-                       pstrReplaceWith->psz,
-                       cReplaceLen + 1);        // include null terminator
+                       pcszReplaceWith,
+                       cReplaceWithLen);
+                *(pszNew + ulFirstReplOfs + cReplaceWithLen) = '\0';
             }
 
@@ -810 +819 @@
             //            ³            ³
             //            pxstr->ulLength = 14
-            memcpy(pszNew + ulFirstReplOfs + cReplaceLen,
+            memcpy(pszNew + ulFirstReplOfs + cReplaceWithLen,
                    pFound + cReplLen,
                    // remaining bytes:
@@ -833 +842 @@
             // first, we move the end to its new location
             // (memmove handles overlap if needed)
-            memmove(pFound + cReplaceLen,
+            memmove(pFound + cReplaceWithLen,
                     pFound + cReplLen,
                     cTailLength + 1); // including null terminator
 
             // now overwrite "found" in the middle
-            if (cReplaceLen)
+            if (cReplaceWithLen)
             {
                 memcpy(pFound,
-                       pstrReplaceWith->psz,
-                       cReplaceLen);        // no null terminator
+                       pcszReplaceWith,
+                       cReplaceWithLen);        // no null terminator
             }
 
@@ -1032 +1041 @@
                                ulFirstReplOfs,              // where to start
                                cSearchLen,                  // chars to replace
-                               pstrReplace);
+                               pstrReplace->psz,
+                               pstrReplace->ulLength);      // adjusted V0.9.11 (2001-04-22) [umoeller]
 
                 // return new length