Changeset d39c46e0 in mainline for uspace/lib/c/generic/str.c

Timestamp:

2018-01-16T19:12:36Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

33b8d024

Parents:

aec41c8

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-16 19:04:19)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-16 19:12:36)

Message:

Implement the full suite of standard string-to-int conversion functions in libc.

File:

• uspace/lib/c/generic/str.c (modified) (2 diffs)

uspace/lib/c/generic/str.c

@@ -1273 +1273 @@
 }
 
-/** Convert string to a number.
- * Core of strtol and strtoul functions.
- *
- * @param nptr          Pointer to string.
- * @param endptr        If not NULL, function stores here pointer to the first
- *                      invalid character.
- * @param base          Zero or number between 2 and 36 inclusive.
- * @param sgn           It's set to 1 if minus found.
- * @return              Result of conversion.
- */
-static unsigned long
-_strtoul(const char *nptr, char **endptr, int base, char *sgn)
-{
-        unsigned char c;
-        unsigned long result = 0;
-        unsigned long a, b;
-        const char *str = nptr;
-        const char *tmpptr;
-        
-        while (isspace(*str))
-                str++;
-        
-        if (*str == '-') {
-                *sgn = 1;
-                ++str;
-        } else if (*str == '+')
-                ++str;
-        
-        if (base) {
-                if ((base == 1) || (base > 36)) {
-                        /* FIXME: set errno to EINVAL */
-                        return 0;
-                }
-                if ((base == 16) && (*str == '0') && ((str[1] == 'x') ||
-                    (str[1] == 'X'))) {
-                        str += 2;
-                }
-        } else {
-                base = 10;
-                
-                if (*str == '0') {
-                        base = 8;
-                        if ((str[1] == 'X') || (str[1] == 'x'))  {
-                                base = 16;
-                                str += 2;
-                        }
-                }
-        }
-        
-        tmpptr = str;
-
-        while (*str) {
-                c = *str;
-                c = (c >= 'a' ? c - 'a' + 10 : (c >= 'A' ? c - 'A' + 10 :
-                    (c <= '9' ? c - '0' : 0xff)));
-                if (c >= base) {
-                        break;
-                }
-                
-                a = (result & 0xff) * base + c;
-                b = (result >> 8) * base + (a >> 8);
-                
-                if (b > (ULONG_MAX >> 8)) {
-                        /* overflow */
-                        /* FIXME: errno = ERANGE*/
-                        return ULONG_MAX;
-                }
-        
-                result = (b << 8) + (a & 0xff);
-                ++str;
-        }
-        
-        if (str == tmpptr) {
-                /*
-                 * No number was found => first invalid character is the first
-                 * character of the string.
-                 */
-                /* FIXME: set errno to EINVAL */
-                str = nptr;
-                result = 0;
-        }
-        
-        if (endptr)
-                *endptr = (char *) str;
-
-        if (nptr == str) {
-                /*FIXME: errno = EINVAL*/
-                return 0;
-        }
-
-        return result;
-}
-
-/** Convert initial part of string to long int according to given base.
- * The number may begin with an arbitrary number of whitespaces followed by
- * optional sign (`+' or `-'). If the base is 0 or 16, the prefix `0x' may be
- * inserted and the number will be taken as hexadecimal one. If the base is 0
- * and the number begin with a zero, number will be taken as octal one (as with
- * base 8). Otherwise the base 0 is taken as decimal.
- *
- * @param nptr          Pointer to string.
- * @param endptr        If not NULL, function stores here pointer to the first
- *                      invalid character.
- * @param base          Zero or number between 2 and 36 inclusive.
- * @return              Result of conversion.
- */
-long int strtol(const char *nptr, char **endptr, int base)
-{
-        char sgn = 0;
-        unsigned long number = 0;
-        
-        number = _strtoul(nptr, endptr, base, &sgn);
-
-        if (number > LONG_MAX) {
-                if ((sgn) && (number == (unsigned long) (LONG_MAX) + 1)) {
-                        /* FIXME: set 0 to errno */
-                        return number;
-                }
-                /* FIXME: set ERANGE to errno */
-                return (sgn ? LONG_MIN : LONG_MAX);
-        }
-        
-        return (sgn ? -number : number);
-}
 
 /** Duplicate string.
@@ -1457 +1333 @@
         str_ncpy(dest, size + 1, src, size);
         return dest;
-}
-
-/** Convert initial part of string to unsigned long according to given base.
- * The number may begin with an arbitrary number of whitespaces followed by
- * optional sign (`+' or `-'). If the base is 0 or 16, the prefix `0x' may be
- * inserted and the number will be taken as hexadecimal one. If the base is 0
- * and the number begin with a zero, number will be taken as octal one (as with
- * base 8). Otherwise the base 0 is taken as decimal.
- *
- * @param nptr          Pointer to string.
- * @param endptr        If not NULL, function stores here pointer to the first
- *                      invalid character
- * @param base          Zero or number between 2 and 36 inclusive.
- * @return              Result of conversion.
- */
-unsigned long strtoul(const char *nptr, char **endptr, int base)
-{
-        char sgn = 0;
-        unsigned long number = 0;
-        
-        number = _strtoul(nptr, endptr, base, &sgn);
-
-        return (sgn ? -number : number);
 }