diff --git a/include/strutils.h b/include/strutils.h index dbcc3d904..28af8b503 100644 --- a/include/strutils.h +++ b/include/strutils.h @@ -45,4 +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); + #endif diff --git a/lib/strutils.c b/lib/strutils.c index aad9f7738..fb1822976 100644 --- a/lib/strutils.c +++ b/lib/strutils.c @@ -424,7 +424,7 @@ int string_to_idarray(const char *list, int ary[], size_t arysz, * as a possition in the 'ary' bit array. It means that the 'id' has to be in * range <0..N> where N < sizeof(ary) * NBBY. * - * Returns: 0 on sucess, <0 on error. + * Returns: 0 on success, <0 on error. */ int string_to_bitarray(const char *list, char *ary, @@ -461,6 +461,49 @@ int string_to_bitarray(const char *list, return 0; } +/* + * 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. + * + * Returns: 0 on success, <0 on error. + */ +int parse_range(const char *str, int *lower, int *upper) +{ + char *end = NULL; + + if (!str) + return 0; + + *upper = *lower = 0; + errno = 0; + + if (*str == ':') { /* <:N> */ + str++; + *upper = strtol(str, &end, 10); + if (errno || !end || *end || end == str) + return -1; + } else { + *upper = *lower = strtol(str, &end, 10); + if (errno || !end || end == str) + return -1; + + if (*end == ':' && !*(end + 1)) /* */ + *upper = 0; + else if (*end == '-' || *end == ':') { /* */ + str = end + 1; + end = NULL; + errno = 0; + *upper = strtol(str, &end, 10); + + if (errno || !end || *end || end == str) + return -1; + } + } + return 0; +} + + #ifdef TEST_PROGRAM int main(int argc, char *argv[]) diff --git a/partx/partx.c b/partx/partx.c index 3a9da9e90..2631d1fdf 100644 --- a/partx/partx.c +++ b/partx/partx.c @@ -558,41 +558,6 @@ done: return rc; } -static int parse_range(const char *str, int *lower, int *upper) -{ - char *end = NULL; - - if (!str) - return 0; - - *upper = *lower = 0; - errno = 0; - - if (*str == ':') { /* <:N> */ - str++; - *upper = strtol(str, &end, 10); - if (errno || !end || *end || end == str) - return -1; - } else { - *upper = *lower = strtol(str, &end, 10); - if (errno || !end || end == str) - return -1; - - if (*end == ':' && !*(end + 1)) /* */ - *upper = 0; - else if (*end == '-' || *end == ':') { /* */ - str = end + 1; - end = NULL; - errno = 0; - *upper = strtol(str, &end, 10); - - if (errno || !end || *end || end == str) - return -1; - } - } - return 0; -} - static blkid_partlist get_partlist(blkid_probe pr, const char *device, char *type) {