chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d4f687c
)
vol_id: always use the safe string versions for unencoded label and uuid
author
Kay Sievers
<kay.sievers@vrfy.org>
Fri, 3 Oct 2008 12:58:02 +0000
(14:58 +0200)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Fri, 3 Oct 2008 12:58:02 +0000
(14:58 +0200)
extras/volume_id/vol_id.c
patch
|
blob
|
history
diff --git
a/extras/volume_id/vol_id.c
b/extras/volume_id/vol_id.c
index 2b487d0b3c51f635862a094ac8c56d46020dd5e0..b153bc54101668f0039f0531d82cf0459b7c0564 100644
(file)
--- a/
extras/volume_id/vol_id.c
+++ b/
extras/volume_id/vol_id.c
@@
-138,7
+138,10
@@
int main(int argc, char *argv[])
struct volume_id *vid = NULL;
char label_safe[256];
char label_enc[256];
struct volume_id *vid = NULL;
char label_safe[256];
char label_enc[256];
+ char uuid_safe[256];
char uuid_enc[256];
char uuid_enc[256];
+ char type_enc[256];
+ char type_version_enc[256];
uint64_t size = 0;
int skip_raid = 0;
int probe_all = 0;
uint64_t size = 0;
int skip_raid = 0;
int probe_all = 0;
@@
-286,20
+289,24
@@
int main(int argc, char *argv[])
set_str(label_safe, label, sizeof(label_safe));
util_replace_chars(label_safe, ALLOWED_CHARS_INPUT);
set_str(label_safe, label, sizeof(label_safe));
util_replace_chars(label_safe, ALLOWED_CHARS_INPUT);
-
volume_id_encode_string(label, label_enc, sizeof(label_enc));
volume_id_encode_string(label, label_enc, sizeof(label_enc));
+
+ set_str(uuid_safe, uuid, sizeof(uuid_safe));
+ util_replace_chars(uuid_safe, 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(type, type_enc, sizeof(type_enc));
+ volume_id_encode_string(type_version, type_version_enc, sizeof(type_version_enc));
+
switch (print) {
case PRINT_EXPORT:
printf("ID_FS_USAGE=%s\n", usage);
switch (print) {
case PRINT_EXPORT:
printf("ID_FS_USAGE=%s\n", usage);
- printf("ID_FS_TYPE=%s\n", type);
- printf("ID_FS_VERSION=%s\n", type_version);
- printf("ID_FS_UUID=%s\n", uuid);
+ printf("ID_FS_TYPE=%s\n", type
_enc
);
+ printf("ID_FS_VERSION=%s\n", type_version
_enc
);
+ 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);
- printf("ID_FS_LABEL=%s\n", label);
+ 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);
- printf("ID_FS_LABEL_SAFE=%s\n", label_safe);
break;
case PRINT_TYPE:
printf("%s\n", type);
break;
case PRINT_TYPE:
printf("%s\n", type);