From: Davidlohr Bueso <dave@gnu.org>
Date: Fri, 14 Oct 2011 20:32:15 +0000 (-0400)
Subject: lib,strutils: add default value to parse_range()
X-Git-Tag: v2.21-rc1~331
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af7df9ee67248029aa47a3e5b2db6e8cbe1915fd;p=thirdparty%2Futil-linux.git

lib,strutils: add default value to parse_range()

This function currently sets the low or high values to 0 when the string doesn't
contain a value, like '123:' or ':123'. In order to make it more flexible, we allow it
to be passed an arbitrary value.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
---

diff --git a/include/strutils.h b/include/strutils.h
index 28af8b503c..9765a77477 100644
--- a/include/strutils.h
+++ b/include/strutils.h
@@ -45,6 +45,6 @@ extern int string_to_idarray(const char *list, int ary[], size_t arysz,
 extern int string_to_bitarray(const char *list, char *ary,
 			    int (*name2bit)(const char *, size_t));
 
-extern int parse_range(const char *str, int *lower, int *upper);
+extern int parse_range(const char *str, int *lower, int *upper, int def);
 
 #endif
diff --git a/lib/strutils.c b/lib/strutils.c
index fb1822976d..6b2ec799e7 100644
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -464,18 +464,19 @@ int string_to_bitarray(const char *list,
 /*
  * Parse the lower and higher values in a string containing
  * "lower:higher" or "lower-higher" format. Note that either
- * the lower or the higher values may be missing.
+ * the lower or the higher values may be missing, and the def
+ * value will be assigned to it by default.
  *
  * Returns: 0 on success, <0 on error.
  */
-int parse_range(const char *str, int *lower, int *upper)
+int parse_range(const char *str, int *lower, int *upper, int def)
 {
 	char *end = NULL;
 
 	if (!str)
 		return 0;
 
-	*upper = *lower = 0;
+	*upper = *lower = def;
 	errno = 0;
 
 	if (*str == ':') {				/* <:N> */
diff --git a/partx/partx.c b/partx/partx.c
index 2631d1fdf3..bf18a4ebe4 100644
--- a/partx/partx.c
+++ b/partx/partx.c
@@ -699,7 +699,7 @@ int main(int argc, char **argv)
 			what = ACT_LIST;
 			break;
 		case 'n':
-			if (parse_range(optarg, &lower, &upper))
+			if (parse_range(optarg, &lower, &upper, 0))
 				errx(EXIT_FAILURE, _("failed to parse --nr <M-N> range"));
 			break;
 		case 'o':