Changeset 95814 in vbox for trunk/src/VBox

Timestamp:

Jul 25, 2022 1:25:01 PM (2 years ago)

Author:

vboxsync

Message:

IPRT/string: Added simple strstr, strrchr and strcspn implementations for IPRT_NO_CRT mode. bugref:10261

Location:

trunk/src/VBox/Runtime/common/string

Files:

• strcspn.cpp (copied) (copied from trunk/src/VBox/Runtime/common/string/strpbrk.cpp ) (2 diffs)
• strrchr.cpp (added)
• strstr.cpp (added)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - strpbrk().
+ * IPRT - CRT Strings, strcspn().
  */
 
@@ -33 +33 @@
 
 /**
- * Find the first occurrence of a character in pszChars in pszStr.
- *
- * @returns
+ * strpbrk with a offset return instead of a pointer.
  */
-#ifdef IPRT_NO_CRT
-char *strpbrk(const char *pszStr, const char *pszBreakChars)
-#elif defined(_MSC_VER)
-# if _MSC_VER >= 1400
-_CRTIMP __checkReturn _CONST_RETURN char *  __cdecl strpbrk(__in_z const char *pszStr, __in_z const char *pszBreakChars)
-# else
-_CRTIMP char * __cdecl strpbrk(const char *pszStr, const char *pszBreakChars)
-# endif
-#elif defined(__WATCOMC__)
-_WCRTLINK char *std::strpbrk(const char *pszStr, const char *pszBreakChars)
-#else
-char *strpbrk(const char *pszStr, const char *pszBreakChars)
-# if defined(__THROW) && !defined(RT_OS_WINDOWS) && !defined(RT_OS_OS2)
-    __THROW
-# endif
-#endif
+size_t strcspn(const char *pszString, const char *pszBreakChars)
 {
-    int chCur;
-    while ((chCur = *pszStr++) != '\0')
+    const char * const pszStringStart = pszString;
+    int                chCur;
+    while ((chCur = *pszString++) != '\0')
     {
-        int chBreak;
-        const char *psz = pszBreakChars;
+        int            chBreak;
+        const char    *psz = pszBreakChars;
         while ((chBreak = *psz++) != '\0')
             if (chBreak == chCur)
-                return (char *)(pszStr - 1);
+                return (size_t)(pszString - pszStringStart + 1);
 
     }
-    return NULL;
+    return (size_t)(pszString - pszStringStart);
 }