return len;
}
-void volume_id_set_unicode16(char *str, size_t len, const uint8_t *buf, enum endian endianess, size_t count)
+size_t volume_id_set_unicode16(uint8_t *str, size_t len, const uint8_t *buf, enum endian endianess, size_t count)
{
- unsigned int i, j;
+ size_t i, j;
uint16_t c;
j = 0;
}
}
str[j] = '\0';
+ return j;
}
static char *usage_to_string(enum volume_id_usage usage_id)
void volume_id_set_label_raw(struct volume_id *id, const uint8_t *buf, size_t count)
{
+ if (count > sizeof(id->label))
+ count = sizeof(id->label);
+
memcpy(id->label_raw, buf, count);
id->label_raw_len = count;
}
void volume_id_set_label_string(struct volume_id *id, const uint8_t *buf, size_t count)
{
- unsigned int i;
+ size_t i;
+
+ if (count >= sizeof(id->label))
+ count = sizeof(id->label)-1;
memcpy(id->label, buf, count);
+ id->label[count] = '\0';
/* remove trailing whitespace */
i = strnlen(id->label, count);
void volume_id_set_label_unicode16(struct volume_id *id, const uint8_t *buf, enum endian endianess, size_t count)
{
- volume_id_set_unicode16(id->label, sizeof(id->label), buf, endianess, count);
+ if (count >= sizeof(id->label))
+ count = sizeof(id->label)-1;
+
+ volume_id_set_unicode16((uint8_t *)id->label, sizeof(id->label), buf, endianess, count);
}
void volume_id_set_uuid(struct volume_id *id, const uint8_t *buf, size_t len, enum uuid_format format)
case UUID_DCE:
count = 16;
break;
- case UUID_FOURINT:
+ case UUID_MD:
count = 35;
break;
+ case UUID_LVM:
+ count = 32;
+ break;
}
memcpy(id->uuid_raw, buf, count);
id->uuid_raw_len = count;
memcpy(id->uuid, buf, count);
id->uuid[count] = '\0';
break;
- case UUID_FOURINT:
+ case UUID_MD:
sprintf(id->uuid,
"%02x%02x%02x%02x:%02x%02x%02x%02x:%02x%02x%02x%02x:%02x%02x%02x%02x",
buf[0], buf[1], buf[2], buf[3],
buf[8], buf[9], buf[10], buf[11],
buf[12], buf[13], buf[14],buf[15]);
break;
+ case UUID_LVM:
+ sprintf(id->uuid,
+ "%c%c%c%c%c%c-%c%c%c%c-%c%c%c%c-%c%c%c%c-%c%c%c%c-%c%c%c%c-%c%c%c%c%c%c",
+ buf[0], buf[1], buf[2], buf[3], buf[4], buf[5],
+ buf[6], buf[7], buf[8], buf[9],
+ buf[10], buf[11], buf[12], buf[13],
+ buf[14], buf[15], buf[16], buf[17],
+ buf[18], buf[19], buf[20], buf[21],
+ buf[22], buf[23], buf[24], buf[25],
+ buf[26], buf[27], buf[28], buf[29], buf[30], buf[31]);
+ break;
}
}