diff options
| -rw-r--r-- | include/strutils.h | 2 | ||||
| -rw-r--r-- | lib/strutils.c | 7 | ||||
| -rw-r--r-- | partx/partx.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/strutils.h b/include/strutils.h index 28af8b503..9765a7747 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 fb1822976..6b2ec799e 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 2631d1fdf..bf18a4ebe 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': |