Changeset 96045 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Aug 5, 2022 12:26:04 AM (2 years ago)

Author:

vboxsync

Message:

IPRT/nocrt: Added strdup, stricmp, strtok, strcat, strncat, strnlen and strtok_r implementations. bugref:10261

Location:

trunk/src/VBox/Runtime/common/string

Files:

• nocrt-strdup.cpp (added)
• nocrt-stricmp.cpp (added)
• nocrt-strtok.cpp (added)
• strcat.cpp (copied) (copied from trunk/src/VBox/Runtime/common/string/strcpy.cpp ) (3 diffs)
• strlen.cpp (modified) (1 diff)
• strncat.cpp (copied) (copied from trunk/src/VBox/Runtime/common/string/strcpy.cpp ) (2 diffs)
• strnlen.cpp (copied) (copied from trunk/src/VBox/Runtime/common/string/strlen.cpp ) (2 diffs)
• strtok_r.cpp (added)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - CRT Strings, strcpy().
+ * IPRT - CRT Strings, strcat().
  */
 
@@ -34 +34 @@
 
 /**
- * Copy a string
+ * Append one string to another.
  *
  * @returns Pointer to destination string
- * @param   pszDst      Will contain a copy of pszSrc.
+ * @param   pszDst      String to append @a pszSrc to.
  * @param   pszSrc      Zero terminated string.
  */
-#ifdef IPRT_NO_CRT
-# undef strcpy
-char *RT_NOCRT(strcpy)(char *pszDst, const char *pszSrc)
-#else
-char *strcpy(char *pszDst, const char *pszSrc)
-#endif
+#undef strcat
+char *RT_NOCRT(strcat)(char *pszDst, const char *pszSrc)
 {
     char * const pszRet = pszDst;
+    pszDst = RTStrEnd(pszDst, RTSTR_MAX);
     while ((*pszDst = *pszSrc++) != '\0')
         pszDst++;
@@ -53 +50 @@
     return pszRet;
 }
-RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(strcpy);
+RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(strcat);
 

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

@@ -41 +41 @@
 #ifdef IPRT_NO_CRT
 # undef strlen
-size_t strlen(const char *pszString)
+size_t RT_NOCRT(strlen)(const char *pszString)
 #elif RT_MSC_PREREQ(RT_MSC_VER_VS2005)
 __checkReturn size_t  __cdecl strlen(__in_z  const char *pszString)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - CRT Strings, strcpy().
+ * IPRT - No-CRT Strings, strncat().
  */
 
@@ -34 +34 @@
 
 /**
- * Copy a string
+ * Append a substring to an existing string.
  *
  * @returns Pointer to destination string
- * @param   pszDst      Will contain a copy of pszSrc.
+ * @param   pszDst      String to append @a cchMaxSrc chars from @a pszSrc to,
+ *                      plus a zero terminator.
  * @param   pszSrc      Zero terminated string.
+ * @param   cchMaxSrc   Maximum number of chars to copy from @a pszSrc.
  */
-#ifdef IPRT_NO_CRT
-# undef strcpy
-char *RT_NOCRT(strcpy)(char *pszDst, const char *pszSrc)
-#else
-char *strcpy(char *pszDst, const char *pszSrc)
-#endif
+#undef strncat
+char *RT_NOCRT(strncat)(char *pszDst, const char *pszSrc, size_t cchMaxSrc)
 {
     char * const pszRet = pszDst;
-    while ((*pszDst = *pszSrc++) != '\0')
-        pszDst++;
+
+    pszDst = RTStrEnd(pszDst, RTSTR_MAX);
+
+    char ch;
+    while (cchMaxSrc-- > 0 && (ch = *pszSrc++) != '\0')
+        *pszDst++ = ch;
+    *pszDst = '\0';
 
     return pszRet;
 }
-RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(strcpy);
+RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(strncat);
 

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - CRT Strings, strlen().
+ * IPRT - CRT Strings, strnlen().
  */
 
@@ -34 +34 @@
 
 /**
- * Find the length of a zeroterminated byte string.
+ * Find the length of a zeroterminated byte string, but only up to a given
+ * limit.
  *
- * @returns String length in bytes.
+ * @returns String length in bytes, or cchMax if too long.
  * @param   pszString   Zero terminated string.
+ * @param   cchMax      Max number of chars to search for the end.
  */
-#ifdef IPRT_NO_CRT
-# undef strlen
-size_t strlen(const char *pszString)
-#elif RT_MSC_PREREQ(RT_MSC_VER_VS2005)
-__checkReturn size_t  __cdecl strlen(__in_z  const char *pszString)
-#else
-size_t strlen(const char *pszString)
-#endif
+#undef strnlen
+size_t RT_NOCRT(strnlen)(const char *pszString, size_t cchMax)
 {
-    const char *psz = pszString;
-    while (*psz)
-        psz++;
-    return psz - pszString;
+    const char * const pszStart = pszString;
+    while (cchMax-- > 0 && *pszString)
+        pszString++;
+    return pszString - pszStart;
 }
-RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(strlen);
+RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(strnlen);