Changeset 346

Timestamp:

Feb 20, 2009, 3:09:25 AM (9 years ago)

Author:

khorben

Message:

Added strtoll() and strtoul()

File:

• trunk/System/Sources/libc/src/stdlib.c (modified) (4 diffs)

trunk/System/Sources/libc/src/stdlib.c

@@ -635 +635 @@
 
 /* strtol */
-static unsigned long _strtoul(char const * str, char ** endptr, int base,
+static unsigned long long _strtoull(char const * str, char ** endptr, int base,
                 int * neg);
+
 long strtol(char const * str, char ** endptr, int base)
 {
@@ -642 +643 @@
         int neg = 0;
 
-        ret = _strtoul(str, endptr, base, &neg);
+        ret = _strtoull(str, endptr, base, &neg);
         if(neg != 0)
         {
@@ -660 +661 @@
 }
 
-static unsigned long _strtoul(char const * str, char ** endptr, int base,
+static unsigned long long _strtoull(char const * str, char ** endptr, int base,
                 int * neg)
 {
-        unsigned long ret = 0;
+        unsigned long long ret = 0;
         char const * p;
         int r;
@@ -723 +724 @@
 
 
+/* strtoll */
+long long strtoll(char const * str, char ** endptr, int base)
+{
+        unsigned long long ret;
+        int neg = 0;
+
+        ret = _strtoull(str, endptr, base, &neg);
+        if(neg != 0)
+        {
+                if(ret > (unsigned)LONG_MAX+1)
+                {
+                        errno = ERANGE;
+                        return LONG_MIN;
+                }
+                return -ret;
+        }
+        if(ret > LONG_MAX)
+        {
+                errno = ERANGE;
+                return LONG_MAX;
+        }
+        return ret;
+}
+
+
 /* strtoul */
 unsigned long strtoul(char const * str, char ** endptr, int base)
 {
-        return _strtoul(str, endptr, base, NULL);
+        return _strtoull(str, endptr, base, NULL);
+}
+
+
+/* strtoull */
+unsigned long long strtoull(char const * str, char ** endptr, int base)
+{
+        return _strtoull(str, endptr, base, NULL);
 }