summaryrefslogtreecommitdiff
path: root/lib/strto.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/strto.c')
-rw-r--r--lib/strto.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/strto.c b/lib/strto.c
index b1d803a77d9..6462d4fddf1 100644
--- a/lib/strto.c
+++ b/lib/strto.c
@@ -183,7 +183,7 @@ long long simple_strtoll(const char *cp, char **endp, unsigned int base)
return simple_strtoull(cp, endp, base);
}
-long trailing_strtoln(const char *str, const char *end)
+long trailing_strtoln_end(const char *str, const char *end, char const **endp)
{
const char *p;
@@ -192,14 +192,24 @@ long trailing_strtoln(const char *str, const char *end)
p = end - 1;
if (p > str && isdigit(*p)) {
do {
- if (!isdigit(p[-1]))
+ if (!isdigit(p[-1])) {
+ if (endp)
+ *endp = p;
return dectoul(p, NULL);
+ }
} while (--p > str);
}
+ if (endp)
+ *endp = end;
return -1;
}
+long trailing_strtoln(const char *str, const char *end)
+{
+ return trailing_strtoln_end(str, end, NULL);
+}
+
long trailing_strtol(const char *str)
{
return trailing_strtoln(str, NULL);