Changes in uspace/lib/c/generic/strtol.c [55092672:1c9bf292] in mainline

File:

• uspace/lib/c/generic/strtol.c (modified) (11 diffs)

uspace/lib/c/generic/strtol.c

@@ -44 +44 @@
 #include <stdbool.h>
 #include <stdlib.h>
-
-// TODO: unit tests
+#include <str.h>
+
+// FIXME: The original HelenOS functions return EOVERFLOW instead
+//        of ERANGE. It's a pointless distinction from standard functions,
+//        so we should change that. Beware the callers though.
+
+// TODO: more unit tests
 
 static inline int _digit_value(int c)
@@ -69 +74 @@
 }
 
+static inline int _prefixbase(const char *restrict *nptrptr, bool nonstd)
+{
+        const char *nptr = *nptrptr;
+
+        if (nptr[0] != '0')
+                return 10;
+
+        if (nptr[1] == 'x' || nptr[1] == 'X') {
+                if (_digit_value(nptr[2]) < 16) {
+                        *nptrptr += 2;
+                        return 16;
+                }
+        }
+
+        if (nonstd) {
+                switch (nptr[1]) {
+                case 'b':
+                case 'B':
+                        if (_digit_value(nptr[2]) < 2) {
+                                *nptrptr += 2;
+                                return 2;
+                        }
+                        break;
+                case 'o':
+                case 'O':
+                        if (_digit_value(nptr[2]) < 8) {
+                                *nptrptr += 2;
+                                return 8;
+                        }
+                        break;
+                case 'd':
+                case 'D':
+                case 't':
+                case 'T':
+                        if (_digit_value(nptr[2]) < 10) {
+                                *nptrptr += 2;
+                                return 10;
+                        }
+                        break;
+                }
+        }
+
+        return 8;
+}
+
 static inline uintmax_t _strtoumax(
     const char *restrict nptr, char **restrict endptr, int base,
-    bool *restrict sgn)
+    bool *restrict sgn, errno_t *err, bool nonstd)
 {
         assert(nptr != NULL);
         assert(sgn != NULL);
+
+        const char *first = nptr;
 
         /* Skip leading whitespace. */
@@ -96 +148 @@
         /* Figure out the base. */
 
-        if (base == 0) {
-                if (*nptr == '0') {
-                        if (tolower(nptr[1]) == 'x') {
-                                /* 0x... is hex. */
-                                base = 16;
-                                nptr += 2;
-                        } else {
-                                /* 0... is octal. */
-                                base = 8;
-                        }
-                } else {
-                        /* Anything else is decimal by default. */
-                        base = 10;
-                }
-        } else if (base == 16) {
-                /* Allow hex number to be prefixed with "0x". */
-                if (nptr[0] == '0' && tolower(nptr[1]) == 'x') {
+        if (base == 0)
+                base = _prefixbase(&nptr, nonstd);
+
+        if (base == 16 && !nonstd) {
+                /*
+                 * Standard strto* functions allow hexadecimal prefix to be
+                 * present when base is explicitly set to 16.
+                 * Our nonstandard str_* functions don't allow it.
+                 * I don't know if that is intended, just matching the original
+                 * functionality here.
+                 */
+
+                if (nptr[0] == '0' && (nptr[1] == 'x' || nptr[1] == 'X') &&
+                    _digit_value(nptr[2]) < base)
                         nptr += 2;
-                }
-        } else if (base < 0 || base == 1 || base > 36) {
-                errno = EINVAL;
+        }
+
+        if (base < 2 || base > 36) {
+                *err = EINVAL;
                 return 0;
         }
 
-        /* Read the value. */
+        /* Must be at least one digit. */
+
+        if (_digit_value(*nptr) >= base) {
+                /* No digits on input. */
+                if (endptr != NULL)
+                        *endptr = (char *) first;
+                return 0;
+        }
+
+        /* Read the value.  */
 
         uintmax_t result = 0;
@@ -127 +186 @@
 
         while (digit = _digit_value(*nptr), digit < base) {
-
                 if (result > max ||
                     __builtin_add_overflow(result * base, digit, &result)) {
 
-                        errno = ERANGE;
+                        *err = nonstd ? EOVERFLOW : ERANGE;
                         result = UINTMAX_MAX;
                         break;
@@ -145 +203 @@
                  * Move the pointer to the end of the number,
                  * in case it isn't there already.
+                 * This can happen when the number has legal formatting,
+                 * but is out of range of the target type.
                  */
                 while (_digit_value(*nptr) < base) {
@@ -157 +217 @@
 
 static inline intmax_t _strtosigned(const char *nptr, char **endptr, int base,
-    intmax_t min, intmax_t max)
+    intmax_t min, intmax_t max, errno_t *err, bool nonstd)
 {
         bool sgn = false;
-        uintmax_t number = _strtoumax(nptr, endptr, base, &sgn);
+        uintmax_t number = _strtoumax(nptr, endptr, base, &sgn, err, nonstd);
 
         if (number > (uintmax_t) max) {
@@ -167 +227 @@
                 }
 
-                errno = ERANGE;
+                *err = nonstd ? EOVERFLOW : ERANGE;
                 return (sgn ? min : max);
         }
@@ -175 +235 @@
 
 static inline uintmax_t _strtounsigned(const char *nptr, char **endptr, int base,
-    uintmax_t max)
+    uintmax_t max, errno_t *err, bool nonstd)
 {
         bool sgn = false;
-        uintmax_t number = _strtoumax(nptr, endptr, base, &sgn);
-
-        if (sgn) {
-                if (number == 0) {
-                        return 0;
-                } else {
-                        errno = ERANGE;
-                        return max;
-                }
+        uintmax_t number = _strtoumax(nptr, endptr, base, &sgn, err, nonstd);
+
+        if (nonstd && sgn) {
+                /* Do not allow negative values */
+                *err = EINVAL;
+                return 0;
         }
 
         if (number > max) {
-                errno = ERANGE;
+                *err = nonstd ? EOVERFLOW : ERANGE;
                 return max;
         }
 
-        return number;
+        return (sgn ? -number : number);
 }
 
@@ -212 +269 @@
 long strtol(const char *nptr, char **endptr, int base)
 {
-        return _strtosigned(nptr, endptr, base, LONG_MIN, LONG_MAX);
+        return _strtosigned(nptr, endptr, base, LONG_MIN, LONG_MAX, &errno, false);
 }
 
@@ -230 +287 @@
 unsigned long strtoul(const char *nptr, char **endptr, int base)
 {
-        return _strtounsigned(nptr, endptr, base, ULONG_MAX);
+        return _strtounsigned(nptr, endptr, base, ULONG_MAX, &errno, false);
 }
 
 long long strtoll(const char *nptr, char **endptr, int base)
 {
-        return _strtosigned(nptr, endptr, base, LLONG_MIN, LLONG_MAX);
+        return _strtosigned(nptr, endptr, base, LLONG_MIN, LLONG_MAX, &errno, false);
 }
 
 unsigned long long strtoull(const char *nptr, char **endptr, int base)
 {
-        return _strtounsigned(nptr, endptr, base, ULLONG_MAX);
+        return _strtounsigned(nptr, endptr, base, ULLONG_MAX, &errno, false);
 }
 
 intmax_t strtoimax(const char *nptr, char **endptr, int base)
 {
-        return _strtosigned(nptr, endptr, base, INTMAX_MIN, INTMAX_MAX);
+        return _strtosigned(nptr, endptr, base, INTMAX_MIN, INTMAX_MAX, &errno, false);
 }
 
 uintmax_t strtoumax(const char *nptr, char **endptr, int base)
 {
-        return _strtounsigned(nptr, endptr, base, UINTMAX_MAX);
+        return _strtounsigned(nptr, endptr, base, UINTMAX_MAX, &errno, false);
 }
 
@@ -268 +325 @@
 }
 
+/** Convert string to uint8_t.
+ *
+ * @param nptr   Pointer to string.
+ * @param endptr If not NULL, pointer to the first invalid character
+ *               is stored here.
+ * @param base   Zero or number between 2 and 36 inclusive.
+ * @param strict Do not allow any trailing characters.
+ * @param result Result of the conversion.
+ *
+ * @return EOK if conversion was successful.
+ *
+ */
+errno_t str_uint8_t(const char *nptr, const char **endptr, unsigned int base,
+    bool strict, uint8_t *result)
+{
+        assert(result != NULL);
+
+        errno_t rc = EOK;
+        char *lendptr = (char *) nptr;
+
+        uintmax_t r = _strtounsigned(nptr, &lendptr, base, UINT8_MAX, &rc, true);
+
+        if (endptr)
+                *endptr = lendptr;
+
+        if (rc != EOK)
+                return rc;
+
+        if (strict && *lendptr != '\0')
+                return EINVAL;
+
+        *result = r;
+        return EOK;
+}
+
+/** Convert string to uint16_t.
+ *
+ * @param nptr   Pointer to string.
+ * @param endptr If not NULL, pointer to the first invalid character
+ *               is stored here.
+ * @param base   Zero or number between 2 and 36 inclusive.
+ * @param strict Do not allow any trailing characters.
+ * @param result Result of the conversion.
+ *
+ * @return EOK if conversion was successful.
+ *
+ */
+errno_t str_uint16_t(const char *nptr, const char **endptr, unsigned int base,
+    bool strict, uint16_t *result)
+{
+        assert(result != NULL);
+
+        errno_t rc = EOK;
+        char *lendptr = (char *) nptr;
+
+        uintmax_t r = _strtounsigned(nptr, &lendptr, base, UINT16_MAX, &rc, true);
+
+        if (endptr)
+                *endptr = lendptr;
+
+        if (rc != EOK)
+                return rc;
+
+        if (strict && *lendptr != '\0')
+                return EINVAL;
+
+        *result = r;
+        return EOK;
+}
+
+/** Convert string to uint32_t.
+ *
+ * @param nptr   Pointer to string.
+ * @param endptr If not NULL, pointer to the first invalid character
+ *               is stored here.
+ * @param base   Zero or number between 2 and 36 inclusive.
+ * @param strict Do not allow any trailing characters.
+ * @param result Result of the conversion.
+ *
+ * @return EOK if conversion was successful.
+ *
+ */
+errno_t str_uint32_t(const char *nptr, const char **endptr, unsigned int base,
+    bool strict, uint32_t *result)
+{
+        assert(result != NULL);
+
+        errno_t rc = EOK;
+        char *lendptr = (char *) nptr;
+
+        uintmax_t r = _strtounsigned(nptr, &lendptr, base, UINT32_MAX, &rc, true);
+
+        if (endptr)
+                *endptr = lendptr;
+
+        if (rc != EOK)
+                return rc;
+
+        if (strict && *lendptr != '\0')
+                return EINVAL;
+
+        *result = r;
+        return EOK;
+}
+
+/** Convert string to uint64_t.
+ *
+ * @param nptr   Pointer to string.
+ * @param endptr If not NULL, pointer to the first invalid character
+ *               is stored here.
+ * @param base   Zero or number between 2 and 36 inclusive.
+ * @param strict Do not allow any trailing characters.
+ * @param result Result of the conversion.
+ *
+ * @return EOK if conversion was successful.
+ *
+ */
+errno_t str_uint64_t(const char *nptr, const char **endptr, unsigned int base,
+    bool strict, uint64_t *result)
+{
+        assert(result != NULL);
+
+        errno_t rc = EOK;
+        char *lendptr = (char *) nptr;
+
+        uintmax_t r = _strtounsigned(nptr, &lendptr, base, UINT64_MAX, &rc, true);
+
+        if (endptr)
+                *endptr = lendptr;
+
+        if (rc != EOK)
+                return rc;
+
+        if (strict && *lendptr != '\0')
+                return EINVAL;
+
+        *result = r;
+        return EOK;
+}
+
+/** Convert string to int64_t.
+ *
+ * @param nptr   Pointer to string.
+ * @param endptr If not NULL, pointer to the first invalid character
+ *               is stored here.
+ * @param base   Zero or number between 2 and 36 inclusive.
+ * @param strict Do not allow any trailing characters.
+ * @param result Result of the conversion.
+ *
+ * @return EOK if conversion was successful.
+ *
+ */
+errno_t str_int64_t(const char *nptr, const char **endptr, unsigned int base,
+    bool strict, int64_t *result)
+{
+        assert(result != NULL);
+
+        errno_t rc = EOK;
+        char *lendptr = (char *) nptr;
+
+        intmax_t r = _strtosigned(nptr, &lendptr, base, INT64_MIN, INT64_MAX, &rc, true);
+
+        if (endptr)
+                *endptr = lendptr;
+
+        if (rc != EOK)
+                return rc;
+
+        if (strict && *lendptr != '\0')
+                return EINVAL;
+
+        *result = r;
+        return EOK;
+}
+
+/** Convert string to size_t.
+ *
+ * @param nptr   Pointer to string.
+ * @param endptr If not NULL, pointer to the first invalid character
+ *               is stored here.
+ * @param base   Zero or number between 2 and 36 inclusive.
+ * @param strict Do not allow any trailing characters.
+ * @param result Result of the conversion.
+ *
+ * @return EOK if conversion was successful.
+ *
+ */
+errno_t str_size_t(const char *nptr, const char **endptr, unsigned int base,
+    bool strict, size_t *result)
+{
+        assert(result != NULL);
+
+        errno_t rc = EOK;
+        char *lendptr = (char *) nptr;
+
+        uintmax_t r = _strtounsigned(nptr, &lendptr, base, SIZE_MAX, &rc, true);
+
+        if (endptr)
+                *endptr = lendptr;
+
+        if (rc != EOK)
+                return rc;
+
+        if (strict && *lendptr != '\0')
+                return EINVAL;
+
+        *result = r;
+        return EOK;
+}
+
 /** @}
  */