shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-09-01 13:59:26 +03:00
Code Activity

volume_id: support sub-uuid's and plug in btrfs device uuid

Browse Source
This commit is contained in:
Kay Sievers
2008-12-09 18:14:23 +01:00
parent 07d9b845c6
commit 14e1827888
7 changed files with 59 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extras/volume_id/lib/btrfs.c
View File

@ -93,6 +93,7 @@ int volume_id_probe_btrfs(struct volume_id *id, uint64_t off, uint64_t size)
if (memcmp(bfs->magic, "_BHRfS_M", 8) != 0) if (memcmp(bfs->magic, "_BHRfS_M", 8) != 0)
return -1; return -1;
volume_id_set_uuid(id, bfs->fsid, 0, UUID_DCE); volume_id_set_uuid(id, bfs->fsid, 0, UUID_DCE);
volume_id_set_uuid_sub(id, bfs->dev_item.uuid, 0, UUID_DCE);
volume_id_set_label_raw(id, bfs->label, 256); volume_id_set_label_raw(id, bfs->label, 256);
volume_id_set_label_string(id, bfs->label, 256); volume_id_set_label_string(id, bfs->label, 256);
volume_id_set_usage(id, VOLUME_ID_FILESYSTEM); volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);

1
extras/volume_id/lib/exported_symbols
View File

@ -3,6 +3,7 @@ volume_id_get_label
volume_id_get_label_raw volume_id_get_label_raw
volume_id_get_uuid volume_id_get_uuid
volume_id_get_uuid_raw volume_id_get_uuid_raw
volume_id_get_uuid_sub
volume_id_get_usage volume_id_get_usage
volume_id_get_type volume_id_get_type
volume_id_get_type_version volume_id_get_type_version

4
extras/volume_id/lib/libvolume_id-private.h
View File

@ -107,6 +107,9 @@ struct volume_id {
uint8_t uuid_raw[VOLUME_ID_UUID_SIZE]; uint8_t uuid_raw[VOLUME_ID_UUID_SIZE];
size_t uuid_raw_len; size_t uuid_raw_len;
char uuid[VOLUME_ID_UUID_SIZE+1]; char uuid[VOLUME_ID_UUID_SIZE+1];
uint8_t uuid_sub_raw[VOLUME_ID_UUID_SIZE];
size_t uuid_sub_raw_len;
char uuid_sub[VOLUME_ID_UUID_SIZE+1];
enum volume_id_usage usage_id; enum volume_id_usage usage_id;
char *usage; char *usage;
char *type; char *type;
@ -129,6 +132,7 @@ extern void volume_id_set_label_raw(struct volume_id *id, const uint8_t *buf, si
extern void volume_id_set_label_string(struct volume_id *id, const uint8_t *buf, size_t count); extern void volume_id_set_label_string(struct volume_id *id, const uint8_t *buf, size_t count);
extern void volume_id_set_label_unicode16(struct volume_id *id, const uint8_t *buf, enum endian endianess, size_t count); extern void volume_id_set_label_unicode16(struct volume_id *id, const uint8_t *buf, enum endian endianess, size_t count);
extern void volume_id_set_uuid(struct volume_id *id, const uint8_t *buf, size_t len, enum uuid_format format); extern void volume_id_set_uuid(struct volume_id *id, const uint8_t *buf, size_t len, enum uuid_format format);
extern void volume_id_set_uuid_sub(struct volume_id *id, const uint8_t *buf, size_t len, enum uuid_format format);
extern uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len); extern uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len);
extern void volume_id_free_buffer(struct volume_id *id); extern void volume_id_free_buffer(struct volume_id *id);

1
extras/volume_id/lib/libvolume_id.h
View File

@ -45,6 +45,7 @@ extern void volume_id_all_probers(all_probers_fn_t all_probers_fn,
extern int volume_id_get_label(struct volume_id *id, const char **label); extern int volume_id_get_label(struct volume_id *id, const char **label);
extern int volume_id_get_label_raw(struct volume_id *id, const uint8_t **label, size_t *len); extern int volume_id_get_label_raw(struct volume_id *id, const uint8_t **label, size_t *len);
extern int volume_id_get_uuid(struct volume_id *id, const char **uuid); extern int volume_id_get_uuid(struct volume_id *id, const char **uuid);
extern int volume_id_get_uuid_sub(struct volume_id *id, const char **uuid);
extern int volume_id_get_uuid_raw(struct volume_id *id, const uint8_t **uuid, size_t *len); extern int volume_id_get_uuid_raw(struct volume_id *id, const uint8_t **uuid, size_t *len);
extern int volume_id_get_usage(struct volume_id *id, const char **usage); extern int volume_id_get_usage(struct volume_id *id, const char **usage);
extern int volume_id_get_type(struct volume_id *id, const char **type); extern int volume_id_get_type(struct volume_id *id, const char **type);

48
extras/volume_id/lib/util.c
View File

@ -250,14 +250,12 @@ void volume_id_set_label_unicode16(struct volume_id *id, const uint8_t *buf, enu
volume_id_set_unicode16((uint8_t *)id->label, sizeof(id->label), buf, endianess, count); 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) static void set_uuid(const uint8_t *buf, size_t len, enum uuid_format format,
char *uuid, uint8_t *uuid_raw, size_t *uuid_raw_len)
{ {
unsigned int i; unsigned int i;
unsigned int count = 0; unsigned int count = 0;
if (len > sizeof(id->uuid_raw))
len = sizeof(id->uuid_raw);
switch(format) { switch(format) {
case UUID_STRING: case UUID_STRING:
count = len; count = len;
@ -281,8 +279,8 @@ void volume_id_set_uuid(struct volume_id *id, const uint8_t *buf, size_t len, en
count = 32; count = 32;
break; break;
} }
memcpy(id->uuid_raw, buf, count); memcpy(uuid_raw, buf, count);
id->uuid_raw_len = count; *uuid_raw_len = count;
/* if set, create string in the same format, the native platform uses */ /* if set, create string in the same format, the native platform uses */
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
@ -293,16 +291,16 @@ void volume_id_set_uuid(struct volume_id *id, const uint8_t *buf, size_t len, en
set: set:
switch(format) { switch(format) {
case UUID_DOS: case UUID_DOS:
sprintf(id->uuid, "%02X%02X-%02X%02X", sprintf(uuid, "%02X%02X-%02X%02X",
buf[3], buf[2], buf[1], buf[0]); buf[3], buf[2], buf[1], buf[0]);
break; break;
case UUID_64BIT_LE: case UUID_64BIT_LE:
sprintf(id->uuid,"%02X%02X%02X%02X%02X%02X%02X%02X", sprintf(uuid,"%02X%02X%02X%02X%02X%02X%02X%02X",
buf[7], buf[6], buf[5], buf[4], buf[7], buf[6], buf[5], buf[4],
buf[3], buf[2], buf[1], buf[0]); buf[3], buf[2], buf[1], buf[0]);
break; break;
case UUID_DCE: case UUID_DCE:
sprintf(id->uuid, sprintf(uuid,
"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", "%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[0], buf[1], buf[2], buf[3],
buf[4], buf[5], buf[4], buf[5],
@ -312,18 +310,18 @@ set:
break; break;
case UUID_HEX_STRING: case UUID_HEX_STRING:
/* translate A..F to a..f */ /* translate A..F to a..f */
memcpy(id->uuid, buf, count); memcpy(uuid, buf, count);
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
if (id->uuid[i] >= 'A' && id->uuid[i] <= 'F') if (uuid[i] >= 'A' && uuid[i] <= 'F')
id->uuid[i] = (id->uuid[i] - 'A') + 'a'; uuid[i] = (uuid[i] - 'A') + 'a';
id->uuid[count] = '\0'; uuid[count] = '\0';
break; break;
case UUID_STRING: case UUID_STRING:
memcpy(id->uuid, buf, count); memcpy(uuid, buf, count);
id->uuid[count] = '\0'; uuid[count] = '\0';
break; break;
case UUID_MD: case UUID_MD:
sprintf(id->uuid, sprintf(uuid,
"%02x%02x%02x%02x:%02x%02x%02x%02x:%02x%02x%02x%02x:%02x%02x%02x%02x", "%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[0], buf[1], buf[2], buf[3],
buf[4], buf[5], buf[6], buf[7], buf[4], buf[5], buf[6], buf[7],
@ -331,7 +329,7 @@ set:
buf[12], buf[13], buf[14],buf[15]); buf[12], buf[13], buf[14],buf[15]);
break; break;
case UUID_LVM: case UUID_LVM:
sprintf(id->uuid, sprintf(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", "%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[0], buf[1], buf[2], buf[3], buf[4], buf[5],
buf[6], buf[7], buf[8], buf[9], buf[6], buf[7], buf[8], buf[9],
@ -344,6 +342,22 @@ set:
} }
} }
void volume_id_set_uuid(struct volume_id *id, const uint8_t *buf, size_t len, enum uuid_format format)
{
if (len > sizeof(id->uuid_raw))
len = sizeof(id->uuid_raw);
set_uuid(buf, len, format, id->uuid, id->uuid_raw, &id->uuid_raw_len);
}
void volume_id_set_uuid_sub(struct volume_id *id, const uint8_t *buf, size_t len, enum uuid_format format)
{
if (len > sizeof(id->uuid_sub_raw))
len = sizeof(id->uuid_sub_raw);
set_uuid(buf, len, format, id->uuid_sub, id->uuid_sub_raw, &id->uuid_sub_raw_len);
}
uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len) uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
{ {
ssize_t buf_len; ssize_t buf_len;

13
extras/volume_id/lib/volume_id.c
View File

@ -219,6 +219,19 @@ int volume_id_get_uuid_raw(struct volume_id *id, const uint8_t **uuid, size_t *l
return 1; return 1;
} }
int volume_id_get_uuid_sub(struct volume_id *id, const char **uuid)
{
if (id == NULL)
return 0;
if (uuid == NULL)
return 0;
if (id->usage_id == VOLUME_ID_UNUSED)
return 0;
*uuid = id->uuid_sub;
return 1;
}
/** /**
* volume_id_get_usage: * volume_id_get_usage:
* @id: Probing context. * @id: Probing context.

10
extras/volume_id/vol_id.c
View File

@ -110,6 +110,7 @@ int main(int argc, char *argv[])
char label_enc[256]; char label_enc[256];
char uuid_safe[256]; char uuid_safe[256];
char uuid_enc[256]; char uuid_enc[256];
char uuid_sub_enc[256];
char type_enc[256]; char type_enc[256];
char type_version_enc[256]; char type_version_enc[256];
uint64_t size = 0; uint64_t size = 0;
@ -118,7 +119,7 @@ int main(int argc, char *argv[])
uint64_t offset = 0; uint64_t offset = 0;
const char *node; const char *node;
int fd; int fd;
const char *label, *uuid, *type, *type_version, *usage; const char *label, *uuid, *uuid_sub, *type, *type_version, *usage;
int retval; int retval;
int rc = 0; int rc = 0;
@ -261,7 +262,8 @@ int main(int argc, char *argv[])
!volume_id_get_usage(vid, &usage) || !volume_id_get_usage(vid, &usage) ||
!volume_id_get_type(vid, &type) || !volume_id_get_type(vid, &type) ||
!volume_id_get_type_version(vid, &type_version) || !volume_id_get_type_version(vid, &type_version) ||
!volume_id_get_uuid(vid, &uuid)) { !volume_id_get_uuid(vid, &uuid) ||
!volume_id_get_uuid_sub(vid, &uuid_sub)) {
rc = 4; rc = 4;
goto exit; goto exit;
} }
@ -274,6 +276,8 @@ int main(int argc, char *argv[])
udev_util_replace_chars(uuid_safe, UDEV_ALLOWED_CHARS_INPUT); udev_util_replace_chars(uuid_safe, UDEV_ALLOWED_CHARS_INPUT);
volume_id_encode_string(uuid, uuid_enc, sizeof(uuid_enc)); volume_id_encode_string(uuid, uuid_enc, sizeof(uuid_enc));
volume_id_encode_string(uuid_sub, uuid_sub_enc, sizeof(uuid_sub_enc));
volume_id_encode_string(type, type_enc, sizeof(type_enc)); volume_id_encode_string(type, type_enc, sizeof(type_enc));
volume_id_encode_string(type_version, type_version_enc, sizeof(type_version_enc)); volume_id_encode_string(type_version, type_version_enc, sizeof(type_version_enc));
@ -284,6 +288,8 @@ int main(int argc, char *argv[])
printf("ID_FS_VERSION=%s\n", type_version_enc); printf("ID_FS_VERSION=%s\n", type_version_enc);
printf("ID_FS_UUID=%s\n", uuid_safe); printf("ID_FS_UUID=%s\n", uuid_safe);
printf("ID_FS_UUID_ENC=%s\n", uuid_enc); printf("ID_FS_UUID_ENC=%s\n", uuid_enc);
if (uuid_sub_enc[0] != '\0')
printf("ID_FS_UUID_SUB_ENC=%s\n", uuid_sub_enc);
printf("ID_FS_LABEL=%s\n", label_safe); printf("ID_FS_LABEL=%s\n", label_safe);
printf("ID_FS_LABEL_ENC=%s\n", label_enc); printf("ID_FS_LABEL_ENC=%s\n", label_enc);
break; break;