From: Karel Zak <kzak@redhat.com>
Date: Sat, 28 Jan 2017 11:39:30 +0000 (+0100)
Subject: lib/strutils: return end pointer by isdigit_string()
X-Git-Tag: v2.29.2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3754dc2ae64c9dbc91aad796ed6d4e183f779a7;p=thirdparty%2Futil-linux.git

lib/strutils: return end pointer by isdigit_string()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/include/strutils.h b/include/strutils.h
index 51d9c9ff35..65d86b2d00 100644
--- a/include/strutils.h
+++ b/include/strutils.h
@@ -36,8 +36,12 @@ extern unsigned long strtoul_or_err(const char *str, const char *errmesg);
 extern void strtotimeval_or_err(const char *str, struct timeval *tv,
 		const char *errmesg);
 
-extern int isdigit_string(const char *str);
-extern int isxdigit_string(const char *str);
+extern int isdigit_strend(const char *str, const char **end);
+#define isdigit_string(_s)	isdigit_strend(_s, NULL)
+
+extern int isxdigit_strend(const char *str, const char **end);
+#define isxdigit_string(_s)	isxdigit_strend(_s, NULL)
+
 
 extern int parse_switch(const char *arg, const char *errmesg, ...);
 
diff --git a/lib/strutils.c b/lib/strutils.c
index d3b998f023..53705d7b28 100644
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -174,21 +174,26 @@ int strtosize(const char *str, uintmax_t *res)
 	return parse_size(str, res, NULL);
 }
 
-int isdigit_string(const char *str)
+int isdigit_strend(const char *str, const char **end)
 {
 	const char *p;
 
 	for (p = str; p && *p && isdigit((unsigned char) *p); p++);
 
+	if (end)
+		*end = p;
 	return p && p > str && !*p;
 }
 
-int isxdigit_string(const char *str)
+int isxdigit_strend(const char *str, const char **end)
 {
 	const char *p;
 
 	for (p = str; p && *p && isxdigit((unsigned char) *p); p++);
 
+	if (end)
+		*end = p;
+
 	return p && p > str && !*p;
 }