ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib,strutils: share parse_range() 

This function is currently only being used by partx(8), but it's handy and
generic enough that we can use it elsewhere as well.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
This commit is contained in:
Davidlohr Bueso 2011-10-11 23:18:12 -04:00 committed by Karel Zak
parent c8ea35145e
commit a883c6349c
3 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/strutils.h
View File

@ -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

45
lib/strutils.c
View File

@ -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)) /* <M:> */
*upper = 0;
else if (*end == '-' || *end == ':') { /* <M:N> <M-N> */
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[])

35
partx/partx.c
View File

@ -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)) /* <M:> */
*upper = 0;
else if (*end == '-' || *end == ':') { /* <M:N> <M-N> */
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)
{