Changeset 33678 in vbox

Timestamp:

Nov 2, 2010 10:30:46 AM (14 years ago)

Author:

vboxsync

Message:

IPRT: Added RTStrCat and RTStrCatEx.

Location:

trunk

Files:

• include/iprt/string.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (4 diffs)
• src/VBox/Runtime/common/string/RTStrCat.cpp (added)
• src/VBox/Runtime/common/string/RTStrCatEx.cpp (added)
• src/VBox/Runtime/common/string/RTStrCopyEx.cpp (modified) (1 diff)
• src/VBox/Runtime/testcase/Makefile.kmk (modified) (2 diffs)
• src/VBox/Runtime/testcase/tstRTStrCatCopy.cpp (added)

trunk/include/iprt/string.h

@@ -2041 +2041 @@
 
 /**
+ * String concatenation with overflow handling.
+ *
+ * @retval  VINF_SUCCESS on success.
+ * @retval  VERR_BUFFER_OVERFLOW if the destination buffer is too small.  The
+ *          buffer will contain as much of the string as it can hold, fully
+ *          terminated.
+ *
+ * @param   pszDst              The destination buffer.
+ * @param   cbDst               The size of the destination buffer (in bytes).
+ * @param   pszSrc              The source string.  NULL is not OK.
+ */
+RTDECL(int) RTStrCat(char *pszDst, size_t cbDst, const char *pszSrc);
+
+/**
+ * String concatenation with overflow handling.
+ *
+ * @retval  VINF_SUCCESS on success.
+ * @retval  VERR_BUFFER_OVERFLOW if the destination buffer is too small.  The
+ *          buffer will contain as much of the string as it can hold, fully
+ *          terminated.
+ *
+ * @param   pszDst              The destination buffer.
+ * @param   cbDst               The size of the destination buffer (in bytes).
+ * @param   pszSrc              The source string.  NULL is not OK.
+ * @param   cchSrcMax           The maximum number of chars (not code points) to
+ *                              copy from the source string, not counting the
+ *                              terminator as usual.
+ */
+RTDECL(int) RTStrCatEx(char *pszDst, size_t cbDst, const char *pszSrc, size_t cchSrcMax);
+
+/**
  * Performs a case sensitive string compare between two UTF-8 strings.
  *

trunk/src/VBox/Runtime/Makefile.kmk

@@ -312 +312 @@
         common/sort/RTSortApvIsSorted.cpp \
         common/sort/shellsort.cpp \
+        common/string/RTStrCat.cpp \
+        common/string/RTStrCatEx.cpp \
         common/string/RTStrCmp.cpp \
         common/string/RTStrConvertHexBytes.cpp \
@@ -962 +964 @@
         common/path/RTPathStripFilename.cpp \
         common/path/RTPathStripTrailingSlash.cpp \
+        common/string/RTStrCat.cpp \
+        common/string/RTStrCatEx.cpp \
         common/string/RTStrCmp.cpp \
         common/string/RTStrCopy.cpp \
@@ -1291 +1295 @@
         common/string/strncmp.cpp \
         common/string/strpbrk.cpp \
+        common/string/RTStrCat.cpp \
+        common/string/RTStrCatEx.cpp \
         common/string/RTStrCopy.cpp \
         common/string/RTStrCopyEx.cpp \
@@ -1426 +1432 @@
         common/rand/randadv.cpp \
         common/rand/randparkmiller.cpp \
+        common/string/RTStrCat.cpp \
+        common/string/RTStrCatEx.cpp \
         common/string/RTStrCmp.cpp \
         common/string/RTStrCopy.cpp \

trunk/src/VBox/Runtime/common/string/RTStrCopyEx.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - RTStrCopy.
+ * IPRT - RTStrCopyEx.
  */
 

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -97 +97 @@
         tstRTStrAlloc \
         tstRTStrCache \
+        tstRTStrCatCopy \
         tstRTStrFormat \
         tstStrSimplePattern \
@@ -428 +429 @@
 tstRTStrCache_SOURCES = tstRTStrCache.cpp
 
+tstRTStrCatCopy_TEMPLATE = VBOXR3TSTEXE
+tstRTStrCatCopy_SOURCES = tstRTStrCatCopy.cpp
+
+tstRTStrFormat_TEMPLATE = VBOXR3TSTEXE
 tstRTStrFormat_SOURCES = tstRTStrFormat.cpp