shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-23 21:35:29 +03:00
Code Releases Activity

o Revert to the 6-4-4-4-4-4-6 format for uuid's

Browse Source 
o  When reading a uuid all -'s are stripped, wherever they are.
This commit is contained in:
Joe Thornber 2002-01-04 16:55:14 +00:00
parent cdff28aca6
commit 55d828c35f
1 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/uuid/uuid.c
View File

@ -11,6 +11,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <assert.h>
static unsigned char _c[] = static unsigned char _c[] =
"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
@ -82,32 +83,53 @@ int id_cmp(struct id *lhs, struct id *rhs)
int id_write_format(struct id *id, char *buffer, size_t size) int id_write_format(struct id *id, char *buffer, size_t size)
{ {
int i; int i, tot;
/* split into 8 groups of four, with dashes in between */ static int group_size[] = {6, 4, 4, 4, 4, 4, 6};
if (size < (GROUPS * 5))
assert(ID_LEN == 32);
/* split into groups seperated by dashes */
if (size < (32 + 6 + 1)) {
log_err("Couldn't write uuid, buffer too small.");
return 0; return 0;
for (i = 0; i < GROUPS; i++) {
memcpy(buffer + (i * 5), id->uuid + (i * 4), 4);
buffer[(i * 5) + 4] = '-';
} }
buffer[(GROUPS * 5) - 1] = '\0'; for (i = 0, tot = 0; i < 7; i++) {
memcpy(buffer, id->uuid + tot, group_size[i]);
buffer += group_size[i];
tot += group_size[i];
*buffer++ = '-';
}
*--buffer = '\0';
return 1; return 1;
} }
int id_read_format(struct id *id, char *buffer) int id_read_format(struct id *id, char *buffer)
{ {
int i; int out = 0;
if (strlen(buffer) < (GROUPS * 5)) { /* just strip out any dashes */
log_err("Insufficient characters to be a proper uuid."); while (*buffer) {
if (*buffer == '-') {
buffer++;
continue;
}
if (out >= ID_LEN) {
log_err("Too many characters to be uuid.");
return 0;
}
id->uuid[out++] = *buffer++;
}
if (out != ID_LEN) {
log_err("Couldn't read uuid, incorrect number of characters.");
return 0; return 0;
} }
for (i = 0; i < ID_LEN; i++)
id->uuid[i] = buffer[((i / 4) * 5) + (i % 4)];
return id_valid(id); return id_valid(id);
} }