[PATCH v2 6/7] parseopt: introduce parseopt_u16() and parseopt_str()

[Antony Pavlov]

Signed-off-by: Antony Pavlov <antonynpavlov at gmail.com>
---
 include/parseopt.h |  2 ++
 lib/parseopt.c     | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/include/parseopt.h b/include/parseopt.h
index becc734c2b..1f9763f8c9 100644
--- a/include/parseopt.h
+++ b/include/parseopt.h
@@ -3,5 +3,7 @@
 
 void parseopt_b(const char *options, const char *opt, bool *val);
 void parseopt_hu(const char *options, const char *opt, unsigned short *val);
+void parseopt_u16(const char *options, const char *opt, uint16_t *val);
+void parseopt_str(const char *options, const char *opt, char **val);
 
 #endif /* __PARSEOPT_H__ */
diff --git a/lib/parseopt.c b/lib/parseopt.c
index 8ff83019a7..8211733e3b 100644
--- a/lib/parseopt.c
+++ b/lib/parseopt.c
@@ -58,3 +58,67 @@ again:
 	if (*endp == ',' || *endp == '\0')
 		*val = v;
 }
+
+void parseopt_u16(const char *options, const char *opt, uint16_t *val)
+{
+	const char *start;
+	size_t optlen = strlen(opt);
+	ulong v;
+	char *endp;
+
+again:
+	start = strstr(options, opt);
+
+	if (!start)
+		return;
+
+	if (start > options && start[-1] != ',') {
+		options = start;
+		goto again;
+	}
+
+	if (start[optlen] != '=') {
+		options = start;
+		goto again;
+	}
+
+	v = simple_strtoul(start + optlen + 1, &endp, 0);
+	if (v > U16_MAX)
+		return;
+
+	if (*endp == ',' || *endp == '\0')
+		*val = v;
+}
+
+void parseopt_str(const char *options, const char *opt, char **val)
+{
+	const char *start;
+	size_t optlen = strlen(opt);
+	char *endp;
+	char *parsed;
+
+again:
+	start = strstr(options, opt);
+
+	if (!start)
+		return;
+
+	if (start > options && start[-1] != ',') {
+		options = start;
+		goto again;
+	}
+
+	if (start[optlen] != '=') {
+		options = start;
+		goto again;
+	}
+
+	parsed = (char *)start + optlen + 1;
+	endp = parsed;
+	while (*endp != '\0' && *endp != ',') {
+
+		endp++;
+	}
+
+	*val = xstrndup(parsed, endp - parsed);
+}
-- 
2.15.1