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

Timestamp:

Feb 23, 2001, 7:50:07 AM (24 years ago)

Author:

umoeller

Message:

Misc. fixes.

File:

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

trunk/src/helpers/xstring.c

@@ -376 +376 @@
  *      With ulSourceLength, specify the length of pcszSource.
  *      If you specify 0, this function will run strlen(pcszSource)
- *      itself. If you already know the length of pcszSource (or
- *      only want to copy a substring), you can speed this function
- *      up a bit this way.
+ *      itself.
+ *
+ *      If you already know the length of pcszSource, you can
+ *      speed this function up a bit this way.
+ *
+ *      You are required to specify ulSourceLength if you only want
+ *      to copy a substring, or pcszSource is not zero-terminated.
  *
  *      Returns the length of the new string (excluding the null
@@ -396 +400 @@
  *@@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
+ *@@changed V0.9.9 (2001-02-16) [umoeller]: now supporting non-zero-terminated pcszSource
  */
 
@@ -432 +437 @@
         // else: we have enough memory
 
-        // strcpy(pxstr->psz, pcszSource);
         memcpy(pxstr->psz,
                pcszSource,
-               ulSourceLength + 1); // V0.9.9 (2001-01-31) [umoeller]
+               ulSourceLength);
+        *(pxstr->psz + ulSourceLength) = '\0';
+                // V0.9.9 (2001-02-16) [umoeller]
+                // we must do this or otherwise we require pcszSource
+                // to be zero-terminated... not a good idea
     }
     else
@@ -480 +488 @@
  *      With ulSourceLength, specify the length of pcszSource.
  *      If you specify 0, this function will run strlen(pcszSource)
- *      itself. If you already know the length of pcszSource (or
- *      only want to copy a substring), you can speed this function
- *      up a bit this way.
+ *      itself.
+ *
+ *      If you already know the length of pcszSource, you can
+ *      speed this function up a bit this way.
+ *
+ *      You are required to specify ulSourceLength if you only want
+ *      to copy a substring, or pcszSource is not zero-terminated.
  *
  *      Returns the length of the new string (excluding the null
@@ -508 +520 @@
  *@@changed V0.9.7 (2000-12-10) [umoeller]: return value was wrong
  *@@changed V0.9.7 (2001-01-15) [umoeller]: added ulSourceLength
+ *@@changed V0.9.9 (2001-02-16) [umoeller]: now supporting non-zero-terminated pcszSource
  */
 
@@ -559 +572 @@
                 memcpy(pxstr->psz + pxstr->ulLength,
                        pcszSource,
-                       ulSourceLength + 1);     // null terminator
+                       ulSourceLength);     // null terminator
+
+                *(pxstr->psz + pxstr->ulLength + ulSourceLength) = '\0';
+                        // V0.9.9 (2001-02-16) [umoeller]
+                        // we must do this or otherwise we require pcszSource
+                        // to be zero-terminated... not a good idea
 
                 // in all cases, set new length