Changeset 96059 in vbox for trunk

Timestamp:

Aug 5, 2022 11:27:49 AM (3 years ago)

Author:

vboxsync

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

152858

Message:

IPRT/nocrt: Added atoi and corrected strto* aliasing. bugref:10261

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• common/string/atoi.cpp (copied) (copied from trunk/src/VBox/Runtime/common/string/nocrt-strtol.cpp ) (2 diffs)
• common/string/nocrt-strtol.cpp (modified) (1 diff)
• common/string/nocrt-strtoll.cpp (modified) (1 diff)
• common/string/nocrt-strtoul.cpp (modified) (1 diff)
• common/string/nocrt-strtoull.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1806 +1806 @@
         common/string/nocrt-strtoul.cpp \
         common/string/nocrt-strtoull.cpp \
+        common/string/atoi.cpp \
         common/string/strtok_r.cpp \
         r3/nocrt-per-thread-1.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - No-CRT - strtol.
+ * IPRT - No-CRT - atoi.
  */
 
@@ -33 +33 @@
 #include <iprt/nocrt/stdlib.h>
 #include <iprt/nocrt/limits.h>
-#include <iprt/nocrt/errno.h>
 #include <iprt/string.h>
 
 
-#undef strtol
-long RT_NOCRT(strtol)(const char *psz, char **ppszNext, int iBase)
+#undef atoi
+int RT_NOCRT(atoi)(const char *psz)
 {
-#if LONG_BIT == 64
-    int64_t iValue = 0;
-    int rc = RTStrToInt64Ex(psz, ppszNext, (unsigned)iBase, &iValue);
-#elif LONG_BIT == 32
+#if INT_MAX == INT32_MAX
     int32_t iValue = 0;
-    int rc = RTStrToInt32Ex(psz, ppszNext, (unsigned)iBase, &iValue);
+    int rc = RTStrToInt32Ex(psz, NULL, 10, &iValue);
 #else
-# error "Unsupported LONG_BIT value"
+# error "Unsupported integer size"
 #endif
     if (rc == VINF_SUCCESS || rc == VWRN_TRAILING_CHARS || rc == VWRN_TRAILING_SPACES)
         return iValue;
     if (rc == VWRN_NUMBER_TOO_BIG)
-    {
-        errno = ERANGE;
-        return iValue < 0 ? LONG_MIN : LONG_MAX;
-    }
-    errno = EINVAL;
+        return iValue < 0 ? INT_MIN : INT_MAX;
     return 0;
 }
+RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(atoi);
 

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

@@ -59 +59 @@
     return 0;
 }
+RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(strtol);
 

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

@@ -56 +56 @@
     return 0;
 }
+RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(strtoll);
 

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

@@ -60 +60 @@
     return 0;
 }
+RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(strtoul);
 

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

@@ -57 +57 @@
     return 0;
 }
+RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(strtoull);