[PATCH] lib/strutils: add default value to parse_range()

[Davidlohr Bueso <dave@xxxxxxx>]

From: Davidlohr Bueso <dave@xxxxxxx>

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@xxxxxxx>
---
 include/strutils.h |    2 +-
 lib/strutils.c     |    7 ++++---
 partx/partx.c      |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/strutils.h b/include/strutils.h
index 28af8b5..9765a77 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 fb18229..6b2ec79 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 2631d1f..bf18a4e 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':
-- 
1.7.7



--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html