Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/bb_strtonum.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/libbb/bb_strtonum.c (modified) (8 diffs)

branches/3.2/mindi-busybox/libbb/bb_strtonum.c

@@ -37 +37 @@
 }
 
-static unsigned long long handle_errors(unsigned long long v, char **endp, char *endptr)
+static unsigned long long handle_errors(unsigned long long v, char **endp)
 {
-    if (endp) *endp = endptr;
+    char next_ch = **endp;
 
     /* errno is already set to ERANGE by strtoXXX if value overflowed */
-    if (endptr[0]) {
+    if (next_ch) {
         /* "1234abcg" or out-of-range? */
-        if (isalnum(endptr[0]) || errno)
+        if (isalnum(next_ch) || errno)
             return ret_ERANGE();
         /* good number, just suspicious terminator */
@@ -58 +58 @@
     char *endptr;
 
+    if (!endp) endp = &endptr;
+    *endp = (char*) arg;
+
     /* strtoul("  -4200000000") returns 94967296, errno 0 (!) */
     /* I don't think that this is right. Preventing this... */
@@ -64 +67 @@
     /* not 100% correct for lib func, but convenient for the caller */
     errno = 0;
-    v = strtoull(arg, &endptr, base);
-    return handle_errors(v, endp, endptr);
+    v = strtoull(arg, endp, base);
+    return handle_errors(v, endp);
 }
 
@@ -72 +75 @@
     unsigned long long v;
     char *endptr;
+    char first;
+
+    if (!endp) endp = &endptr;
+    *endp = (char*) arg;
 
     /* Check for the weird "feature":
      * a "-" string is apparently a valid "number" for strto[u]l[l]!
      * It returns zero and errno is 0! :( */
-    char first = (arg[0] != '-' ? arg[0] : arg[1]);
+    first = (arg[0] != '-' ? arg[0] : arg[1]);
     if (!isalnum(first)) return ret_ERANGE();
 
     errno = 0;
-    v = strtoll(arg, &endptr, base);
-    return handle_errors(v, endp, endptr);
+    v = strtoll(arg, endp, base);
+    return handle_errors(v, endp);
 }
 
@@ -90 +97 @@
     char *endptr;
 
+    if (!endp) endp = &endptr;
+    *endp = (char*) arg;
+
     if (!isalnum(arg[0])) return ret_ERANGE();
     errno = 0;
-    v = strtoul(arg, &endptr, base);
-    return handle_errors(v, endp, endptr);
+    v = strtoul(arg, endp, base);
+    return handle_errors(v, endp);
 }
 
@@ -100 +110 @@
     long v;
     char *endptr;
+    char first;
 
-    char first = (arg[0] != '-' ? arg[0] : arg[1]);
+    if (!endp) endp = &endptr;
+    *endp = (char*) arg;
+
+    first = (arg[0] != '-' ? arg[0] : arg[1]);
     if (!isalnum(first)) return ret_ERANGE();
 
     errno = 0;
-    v = strtol(arg, &endptr, base);
-    return handle_errors(v, endp, endptr);
+    v = strtol(arg, endp, base);
+    return handle_errors(v, endp);
 }
 #endif
@@ -116 +130 @@
     char *endptr;
 
+    if (!endp) endp = &endptr;
+    *endp = (char*) arg;
+
     if (!isalnum(arg[0])) return ret_ERANGE();
     errno = 0;
-    v = strtoul(arg, &endptr, base);
+    v = strtoul(arg, endp, base);
     if (v > UINT_MAX) return ret_ERANGE();
-    return handle_errors(v, endp, endptr);
+    return handle_errors(v, endp);
 }
 
@@ -127 +144 @@
     long v;
     char *endptr;
+    char first;
 
-    char first = (arg[0] != '-' ? arg[0] : arg[1]);
+    if (!endp) endp = &endptr;
+    *endp = (char*) arg;
+
+    first = (arg[0] != '-' ? arg[0] : arg[1]);
     if (!isalnum(first)) return ret_ERANGE();
 
     errno = 0;
-    v = strtol(arg, &endptr, base);
+    v = strtol(arg, endp, base);
     if (v > INT_MAX) return ret_ERANGE();
     if (v < INT_MIN) return ret_ERANGE();
-    return handle_errors(v, endp, endptr);
+    return handle_errors(v, endp);
 }
 #endif