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

Timestamp:

Aug 5, 2022 10:48:48 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

152851

Message:

IPRT/nocrt: Added no-CRT per-thread data like errno and strtok state. Implemented strtol and errno accessor. bugref:10261

Location:

trunk/src/VBox/Runtime/common/string

Files:

• nocrt-strtok.cpp (modified) (2 diffs)
• nocrt-strtol.cpp (added)

trunk/src/VBox/Runtime/common/string/nocrt-strtok.cpp

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include "internal/iprt.h"
+#include "internal/nocrt.h"
 #include <iprt/string.h>
 
@@ -36 +36 @@
 char *RT_NOCRT(strtok)(char *psz, const char *pszDelimiters)
 {
-    static char *s_pszState = NULL; /** @todo make this a TLS variable. */
-    return RT_NOCRT(strtok_r)(psz, pszDelimiters, &s_pszState);
+    PRTNOCRTTHREADDATA pNoCrtData = rtNoCrtThreadDataGet();
+    if (pNoCrtData)
+        return RT_NOCRT(strtok_r)(psz, pszDelimiters, &pNoCrtData->pszStrToken);
+
+    static char *s_pszFallback = NULL;
+    return RT_NOCRT(strtok_r)(psz, pszDelimiters, &s_pszFallback);
 }
 RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(strtok);