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

Merge branch 'libuuid-range' of https://github.com/UQ-RCC/util-linux 

* 'libuuid-range' of https://github.com/UQ-RCC/util-linux:
  libuuid: add uuid_parse_range()
This commit is contained in:
Karel Zak 2020-02-27 14:44:43 +01:00
parent 57b9d60cb5 e64a8f9cbf
commit ef59d1908d
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libuuid/src/parse.c
View File

@ -40,15 +40,24 @@
#include "uuidP.h"
int uuid_parse(const char *in, uuid_t uu)
{
size_t len = strlen(in);
if (len != 36)
return -1;
return uuid_parse_range(in, in + len, uu);
}
int uuid_parse_range(const char *in_start, const char *in_end, uuid_t uu)
{
struct uuid uuid;
int i;
const char *cp;
char buf[3];
if (strlen(in) != 36)
if ((in_end - in_start) != 36)
return -1;
for (i=0, cp = in; i <= 36; i++,cp++) {
for (i=0, cp = in_start; i <= 36; i++,cp++) {
if ((i == 8) || (i == 13) || (i == 18) ||
(i == 23)) {
if (*cp == '-')
@ -62,11 +71,11 @@ int uuid_parse(const char *in, uuid_t uu)
if (!isxdigit(*cp))
return -1;
}
uuid.time_low = strtoul(in, NULL, 16);
uuid.time_mid = strtoul(in+9, NULL, 16);
uuid.time_hi_and_version = strtoul(in+14, NULL, 16);
uuid.clock_seq = strtoul(in+19, NULL, 16);
cp = in+24;
uuid.time_low = strtoul(in_start, NULL, 16);
uuid.time_mid = strtoul(in_start+9, NULL, 16);
uuid.time_hi_and_version = strtoul(in_start+14, NULL, 16);
uuid.clock_seq = strtoul(in_start+19, NULL, 16);
cp = in_start+24;
buf[2] = 0;
for (i=0; i < 6; i++) {
buf[0] = *cp++;

1
libuuid/src/uuid.h
View File

@ -100,6 +100,7 @@ extern int uuid_is_null(const uuid_t uu);
/* parse.c */
extern int uuid_parse(const char *in, uuid_t uu);
extern int uuid_parse_range(const char *in_start, const char *in_end, uuid_t uu);
/* unparse.c */
extern void uuid_unparse(const uuid_t uu, char *out);