From 150394604db4ddd246865a1d5d52386e19883652 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 10 Dec 2020 12:10:06 +0100 Subject: [PATCH] blkid: encode all udf and iso IDs in udev output We encode to "safe" strings almost all variables for 'blkid -o udev' and we need it also for SYSTEM_ID, PUBLISHER_ID, APPLICATION_ID, BOOT_SYSTEM_ID and recently added VOLUME_SET_ID and DATA_PREPARER_ID. This change makes blkid from util-linux more compatible with built-in udevd blkid. Addresses: https://github.com/karelzak/util-linux/pull/1215 (commit 5cbffdb74f6fec51b2cf260bea66375823fe65e7) Signed-off-by: Karel Zak --- misc-utils/blkid.c | 9 ++++++++- tests/expected/blkid/low-probe-iso | 2 +- .../blkid/low-probe-iso-different-iso-joliet-label | 10 +++++----- tests/expected/blkid/low-probe-iso-joliet | 2 +- tests/expected/blkid/low-probe-iso-multi-genisoimage-0 | 2 +- .../expected/blkid/low-probe-iso-multi-genisoimage-174 | 2 +- .../expected/blkid/low-probe-iso-multi-genisoimage-348 | 2 +- tests/expected/blkid/low-probe-iso-rr-joliet | 2 +- tests/expected/blkid/low-probe-iso-unicode-long-label | 10 +++++----- .../expected/blkid/low-probe-udf-hdd-macosx-2.60-4096 | 6 +++--- tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-1 | 4 ++-- tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-2 | 6 +++--- tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-1 | 4 ++-- tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-2 | 4 ++-- tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-3 | 4 ++-- tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-4 | 4 ++-- tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-5 | 4 ++-- tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-6 | 4 ++-- tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-7 | 4 ++-- tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8 | 4 ++-- tests/expected/blkid/low-probe-udf-hdd-mkudffs-2.2 | 4 ++-- tests/expected/blkid/low-probe-udf-hdd-win7 | 4 ++-- tests/expected/blkid/low-probe-udf-multi-mkudffs-0 | 4 ++-- tests/expected/blkid/low-probe-udf-multi-mkudffs-320 | 4 ++-- tests/expected/blkid/low-probe-udf-multi-mkudffs-640 | 4 ++-- 25 files changed, 58 insertions(+), 51 deletions(-) diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c index 4f23f09f66..9057a31e1b 100644 --- a/misc-utils/blkid.c +++ b/misc-utils/blkid.c @@ -254,7 +254,14 @@ static void print_udev_format(const char *name, const char *value) *safe = *enc = '\0'; - if (!strcmp(name, "TYPE") || !strcmp(name, "VERSION")) { + if (!strcmp(name, "TYPE") + || !strcmp(name, "VERSION") + || !strcmp(name, "SYSTEM_ID") + || !strcmp(name, "PUBLISHER_ID") + || !strcmp(name, "APPLICATION_ID") + || !strcmp(name, "BOOT_SYSTEM_ID") + || !strcmp(name, "VOLUME_SET_ID") + || !strcmp(name, "DATA_PREPARER_ID")) { blkid_encode_string(value, enc, sizeof(enc)); printf("ID_FS_%s=%s\n", name, enc); diff --git a/tests/expected/blkid/low-probe-iso b/tests/expected/blkid/low-probe-iso index 082f0742a3..5c8a3d0fd8 100644 --- a/tests/expected/blkid/low-probe-iso +++ b/tests/expected/blkid/low-probe-iso @@ -1,4 +1,4 @@ -ID_FS_APPLICATION_ID=GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +ID_FS_APPLICATION_ID=GENISOIMAGE\x20ISO\x209660\x2fHFS\x20FILESYSTEM\x20CREATOR\x20\x28C\x29\x201993\x20E.YOUNGDALE\x20\x28C\x29\x201997-2006\x20J.PEARSON\x2fJ.SCHILLING\x20\x28C\x29\x202006-2007\x20CDRKIT\x20TEAM ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=IsoVolumeName ID_FS_LABEL_ENC=IsoVolumeName diff --git a/tests/expected/blkid/low-probe-iso-different-iso-joliet-label b/tests/expected/blkid/low-probe-iso-different-iso-joliet-label index e740a5d7d0..f618d024d5 100644 --- a/tests/expected/blkid/low-probe-iso-different-iso-joliet-label +++ b/tests/expected/blkid/low-probe-iso-different-iso-joliet-label @@ -1,11 +1,11 @@ -ID_FS_APPLICATION_ID=Joliet Application +ID_FS_APPLICATION_ID=Joliet\x20Application ID_FS_BLOCK_SIZE=2048 -ID_FS_DATA_PREPARER_ID=Joliet Preparer +ID_FS_DATA_PREPARER_ID=Joliet\x20Preparer ID_FS_LABEL=Joliet_Label ID_FS_LABEL_ENC=Joliet\x20Label -ID_FS_PUBLISHER_ID=Joliet Publisher -ID_FS_SYSTEM_ID=Joliet System id +ID_FS_PUBLISHER_ID=Joliet\x20Publisher +ID_FS_SYSTEM_ID=Joliet\x20System\x20id ID_FS_TYPE=iso9660 ID_FS_USAGE=filesystem ID_FS_VERSION=Joliet\x20Extension -ID_FS_VOLUME_SET_ID=Joliet Volume set +ID_FS_VOLUME_SET_ID=Joliet\x20Volume\x20set diff --git a/tests/expected/blkid/low-probe-iso-joliet b/tests/expected/blkid/low-probe-iso-joliet index 06f529d03b..e97dbde3c4 100644 --- a/tests/expected/blkid/low-probe-iso-joliet +++ b/tests/expected/blkid/low-probe-iso-joliet @@ -1,4 +1,4 @@ -ID_FS_APPLICATION_ID=GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +ID_FS_APPLICATION_ID=GENISOIMAGE\x20ISO\x209660\x2fHFS\x20FILESYSTEM\x20CREATOR\x20\x28C\x29\x201993\x20E.YOUNGDALE\x20\x28C\x29\x201997-2006\x20J.PEARSON\x2fJ.SCHILLING\x20\x28C\x29\x202006-2007\x20CDRKIT\x20TEAM ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=ThisWonderfulLabelIsVeryVeryLong ID_FS_LABEL_ENC=ThisWonderfulLabelIsVeryVeryLong diff --git a/tests/expected/blkid/low-probe-iso-multi-genisoimage-0 b/tests/expected/blkid/low-probe-iso-multi-genisoimage-0 index 3a4997a4d7..d8217f5299 100644 --- a/tests/expected/blkid/low-probe-iso-multi-genisoimage-0 +++ b/tests/expected/blkid/low-probe-iso-multi-genisoimage-0 @@ -1,4 +1,4 @@ -ID_FS_APPLICATION_ID=GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +ID_FS_APPLICATION_ID=GENISOIMAGE\x20ISO\x209660\x2fHFS\x20FILESYSTEM\x20CREATOR\x20\x28C\x29\x201993\x20E.YOUNGDALE\x20\x28C\x29\x201997-2006\x20J.PEARSON\x2fJ.SCHILLING\x20\x28C\x29\x202006-2007\x20CDRKIT\x20TEAM ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=first_session ID_FS_LABEL_ENC=first\x20session diff --git a/tests/expected/blkid/low-probe-iso-multi-genisoimage-174 b/tests/expected/blkid/low-probe-iso-multi-genisoimage-174 index 154802cc7e..9c18d0dde2 100644 --- a/tests/expected/blkid/low-probe-iso-multi-genisoimage-174 +++ b/tests/expected/blkid/low-probe-iso-multi-genisoimage-174 @@ -1,4 +1,4 @@ -ID_FS_APPLICATION_ID=GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +ID_FS_APPLICATION_ID=GENISOIMAGE\x20ISO\x209660\x2fHFS\x20FILESYSTEM\x20CREATOR\x20\x28C\x29\x201993\x20E.YOUNGDALE\x20\x28C\x29\x201997-2006\x20J.PEARSON\x2fJ.SCHILLING\x20\x28C\x29\x202006-2007\x20CDRKIT\x20TEAM ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=second_session ID_FS_LABEL_ENC=second\x20session diff --git a/tests/expected/blkid/low-probe-iso-multi-genisoimage-348 b/tests/expected/blkid/low-probe-iso-multi-genisoimage-348 index 0af953911f..7e3c5ba01c 100644 --- a/tests/expected/blkid/low-probe-iso-multi-genisoimage-348 +++ b/tests/expected/blkid/low-probe-iso-multi-genisoimage-348 @@ -1,4 +1,4 @@ -ID_FS_APPLICATION_ID=GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +ID_FS_APPLICATION_ID=GENISOIMAGE\x20ISO\x209660\x2fHFS\x20FILESYSTEM\x20CREATOR\x20\x28C\x29\x201993\x20E.YOUNGDALE\x20\x28C\x29\x201997-2006\x20J.PEARSON\x2fJ.SCHILLING\x20\x28C\x29\x202006-2007\x20CDRKIT\x20TEAM ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=third_session ID_FS_LABEL_ENC=third\x20session diff --git a/tests/expected/blkid/low-probe-iso-rr-joliet b/tests/expected/blkid/low-probe-iso-rr-joliet index bb3274db3a..711e04bbc4 100644 --- a/tests/expected/blkid/low-probe-iso-rr-joliet +++ b/tests/expected/blkid/low-probe-iso-rr-joliet @@ -1,4 +1,4 @@ -ID_FS_APPLICATION_ID=GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +ID_FS_APPLICATION_ID=GENISOIMAGE\x20ISO\x209660\x2fHFS\x20FILESYSTEM\x20CREATOR\x20\x28C\x29\x201993\x20E.YOUNGDALE\x20\x28C\x29\x201997-2006\x20J.PEARSON\x2fJ.SCHILLING\x20\x28C\x29\x202006-2007\x20CDRKIT\x20TEAM ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=ThisIsVolumeName ID_FS_LABEL_ENC=ThisIsVolumeName diff --git a/tests/expected/blkid/low-probe-iso-unicode-long-label b/tests/expected/blkid/low-probe-iso-unicode-long-label index 9d4a48b82a..270ee84890 100644 --- a/tests/expected/blkid/low-probe-iso-unicode-long-label +++ b/tests/expected/blkid/low-probe-iso-unicode-long-label @@ -1,11 +1,11 @@ -ID_FS_APPLICATION_ID=Nero Linux +ID_FS_APPLICATION_ID=Nero\x20Linux ID_FS_BLOCK_SIZE=2048 -ID_FS_DATA_PREPARER_ID=Naïve and very looooooooooooooooooooooooooooooooooooooooooooooooOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG DATA PREPARER +ID_FS_DATA_PREPARER_ID=Naïve\x20and\x20very\x20looooooooooooooooooooooooooooooooooooooooooooooooOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG\x20DATA\x20PREPARER ID_FS_LABEL=Naïve_and_very_lOOOOOOOONG_LABEL ID_FS_LABEL_ENC=Naïve\x20and\x20very\x20lOOOOOOOONG_LABEL -ID_FS_PUBLISHER_ID=Naïve and very looooooooooooooooooooooooooooooooooooooooooooooooOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG PUBLISHER -ID_FS_SYSTEM_ID=Naïve and very lONG SYSTEM IDENT +ID_FS_PUBLISHER_ID=Naïve\x20and\x20very\x20looooooooooooooooooooooooooooooooooooooooooooooooOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG\x20PUBLISHER +ID_FS_SYSTEM_ID=Naïve\x20and\x20very\x20lONG\x20SYSTEM\x20IDENT ID_FS_TYPE=iso9660 ID_FS_USAGE=filesystem ID_FS_VERSION=Joliet\x20Extension -ID_FS_VOLUME_SET_ID=Naïve and very looooooooooooooooooooooooooooooooooooooooooooooooOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG_VOLUME_SET +ID_FS_VOLUME_SET_ID=Naïve\x20and\x20very\x20looooooooooooooooooooooooooooooooooooooooooooooooOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG_VOLUME_SET diff --git a/tests/expected/blkid/low-probe-udf-hdd-macosx-2.60-4096 b/tests/expected/blkid/low-probe-udf-hdd-macosx-2.60-4096 index c840ac53df..d43be93f3c 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-macosx-2.60-4096 +++ b/tests/expected/blkid/low-probe-udf-hdd-macosx-2.60-4096 @@ -1,13 +1,13 @@ -ID_FS_APPLICATION_ID=Mac OS X udf newfs_udf +ID_FS_APPLICATION_ID=Mac\x20OS\x20X\x20udf\x20newfs_udf ID_FS_BLOCK_SIZE=4096 ID_FS_LABEL=Untitled_UDF_Volume ID_FS_LABEL_ENC=Untitled\x20UDF\x20Volume ID_FS_LOGICAL_VOLUME_ID=Untitled UDF Volume -ID_FS_PUBLISHER_ID=Default Owner Name +ID_FS_PUBLISHER_ID=Default\x20Owner\x20Name ID_FS_TYPE=udf ID_FS_USAGE=filesystem ID_FS_UUID=691eed1320284d61 ID_FS_UUID_ENC=691eed1320284d61 ID_FS_VERSION=2.60 ID_FS_VOLUME_ID=MacOS X UDF 2017-12-28 1145.55 -ID_FS_VOLUME_SET_ID=691EED13 (Mac OS X newfs_udf) UDF Volume Set +ID_FS_VOLUME_SET_ID=691EED13\x20\x28Mac\x20OS\x20X\x20newfs_udf\x29\x20UDF\x20Volume\x20Set diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-1 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-1 index 3ee416b3c0..930259204d 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-1 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-1 @@ -1,9 +1,9 @@ -ID_FS_APPLICATION_ID=Linux mkudffs +ID_FS_APPLICATION_ID=Linux\x20mkudffs ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=LinuxUDF ID_FS_LABEL_ENC=LinuxUDF ID_FS_LOGICAL_VOLUME_ID=LinuxUDF -ID_FS_PUBLISHER_ID=Linux mkudffs 1.0.0b2 +ID_FS_PUBLISHER_ID=Linux\x20mkudffs\x201.0.0b2 ID_FS_TYPE=udf ID_FS_USAGE=filesystem ID_FS_UUID=54aeb2524c696e75 diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-2 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-2 index 5018f89a66..a0fdb2ee24 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-2 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-2 @@ -1,13 +1,13 @@ -ID_FS_APPLICATION_ID=Linux mkudffs +ID_FS_APPLICATION_ID=Linux\x20mkudffs ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=Label ID_FS_LABEL_ENC=Label ID_FS_LOGICAL_VOLUME_ID=Label -ID_FS_PUBLISHER_ID=Linux mkudffs 1.0.0b2 +ID_FS_PUBLISHER_ID=Linux\x20mkudffs\x201.0.0b2 ID_FS_TYPE=udf ID_FS_USAGE=filesystem ID_FS_UUID=54aead85c291280d ID_FS_UUID_ENC=54aead85c291280d ID_FS_VERSION=2.01 ID_FS_VOLUME_ID=Label -ID_FS_VOLUME_SET_ID=54aead85‘( Volume set identifier +ID_FS_VOLUME_SET_ID=54aead85‘\x28\x0d\x01Volume\x20set\x20identifier diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-1 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-1 index 3f8cbe00cd..ef36b84e0d 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-1 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-1 @@ -1,9 +1,9 @@ -ID_FS_APPLICATION_ID=Linux mkudffs +ID_FS_APPLICATION_ID=Linux\x20mkudffs ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=Label ID_FS_LABEL_ENC=Label ID_FS_LOGICAL_VOLUME_ID=Label -ID_FS_PUBLISHER_ID=Linux mkudffs 1.3 +ID_FS_PUBLISHER_ID=Linux\x20mkudffs\x201.3 ID_FS_TYPE=udf ID_FS_USAGE=filesystem ID_FS_UUID=5906e052003d522a diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-2 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-2 index b2589cfb51..58a8bf6125 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-2 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-2 @@ -1,9 +1,9 @@ -ID_FS_APPLICATION_ID=Linux mkudffs +ID_FS_APPLICATION_ID=Linux\x20mkudffs ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=Label ID_FS_LABEL_ENC=Label ID_FS_LOGICAL_VOLUME_ID=Label -ID_FS_PUBLISHER_ID=Linux mkudffs 1.3 +ID_FS_PUBLISHER_ID=Linux\x20mkudffs\x201.3 ID_FS_TYPE=udf ID_FS_USAGE=filesystem ID_FS_UUID=5906e7a800531574 diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-3 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-3 index 5795871928..0e1e7706b5 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-3 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-3 @@ -1,9 +1,9 @@ -ID_FS_APPLICATION_ID=Linux mkudffs +ID_FS_APPLICATION_ID=Linux\x20mkudffs ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=ÿ ID_FS_LABEL_ENC=ÿ ID_FS_LOGICAL_VOLUME_ID=ÿ -ID_FS_PUBLISHER_ID=Linux mkudffs 1.3 +ID_FS_PUBLISHER_ID=Linux\x20mkudffs\x201.3 ID_FS_TYPE=udf ID_FS_USAGE=filesystem ID_FS_UUID=5914e5d44790645a diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-4 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-4 index 0aca2ec55c..00561717d0 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-4 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-4 @@ -1,9 +1,9 @@ -ID_FS_APPLICATION_ID=Linux mkudffs +ID_FS_APPLICATION_ID=Linux\x20mkudffs ID_FS_BLOCK_SIZE=1024 ID_FS_LABEL=Label ID_FS_LABEL_ENC=Label ID_FS_LOGICAL_VOLUME_ID=Label -ID_FS_PUBLISHER_ID=Linux mkudffs 1.3 +ID_FS_PUBLISHER_ID=Linux\x20mkudffs\x201.3 ID_FS_TYPE=udf ID_FS_USAGE=filesystem ID_FS_UUID=59418701b1e8322d diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-5 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-5 index f82639106d..69ee62f97d 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-5 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-5 @@ -1,9 +1,9 @@ -ID_FS_APPLICATION_ID=Linux mkudffs +ID_FS_APPLICATION_ID=Linux\x20mkudffs ID_FS_BLOCK_SIZE=4096 ID_FS_LABEL=Label ID_FS_LABEL_ENC=Label ID_FS_LOGICAL_VOLUME_ID=Label -ID_FS_PUBLISHER_ID=Linux mkudffs 1.3 +ID_FS_PUBLISHER_ID=Linux\x20mkudffs\x201.3 ID_FS_TYPE=udf ID_FS_USAGE=filesystem ID_FS_UUID=594186edcc164a70 diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-6 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-6 index f0ad4d5f66..2d3876b7eb 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-6 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-6 @@ -1,9 +1,9 @@ -ID_FS_APPLICATION_ID=Linux mkudffs +ID_FS_APPLICATION_ID=Linux\x20mkudffs ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ID_FS_LABEL_ENC=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ID_FS_LOGICAL_VOLUME_ID=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -ID_FS_PUBLISHER_ID=Linux mkudffs 1.3 +ID_FS_PUBLISHER_ID=Linux\x20mkudffs\x201.3 ID_FS_TYPE=udf ID_FS_USAGE=filesystem ID_FS_UUID=59419a34ca436d67 diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-7 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-7 index 6822706d8c..e60bf17935 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-7 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-7 @@ -1,9 +1,9 @@ -ID_FS_APPLICATION_ID=Linux mkudffs +ID_FS_APPLICATION_ID=Linux\x20mkudffs ID_FS_BLOCK_SIZE=4096 ID_FS_LABEL=Label4096 ID_FS_LABEL_ENC=Label4096 ID_FS_LOGICAL_VOLUME_ID=Label4096 -ID_FS_PUBLISHER_ID=Linux mkudffs 1.3 +ID_FS_PUBLISHER_ID=Linux\x20mkudffs\x201.3 ID_FS_TYPE=udf ID_FS_USAGE=filesystem ID_FS_UUID=5a08b6f521891529 diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8 index 066449d58e..0785782428 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8 @@ -1,9 +1,9 @@ -ID_FS_APPLICATION_ID=Linux mkudffs +ID_FS_APPLICATION_ID=Linux\x20mkudffs ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=LinuxUDF ID_FS_LABEL_ENC=LinuxUDF ID_FS_LOGICAL_VOLUME_ID=LinuxUDF -ID_FS_PUBLISHER_ID=Linux mkudffs 1.3 +ID_FS_PUBLISHER_ID=Linux\x20mkudffs\x201.3 ID_FS_TYPE=udf ID_FS_USAGE=filesystem ID_FS_UUID=5a11940936fe76a8 diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-2.2 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-2.2 index 543f2e170e..77300512ac 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-2.2 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-2.2 @@ -1,9 +1,9 @@ -ID_FS_APPLICATION_ID=Linux mkudffs +ID_FS_APPLICATION_ID=Linux\x20mkudffs ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=😀 ID_FS_LABEL_ENC=😀 ID_FS_LOGICAL_VOLUME_ID=😀 -ID_FS_PUBLISHER_ID=Linux mkudffs 2.2 +ID_FS_PUBLISHER_ID=Linux\x20mkudffs\x202.2 ID_FS_TYPE=udf ID_FS_USAGE=filesystem ID_FS_UUID=5e3d6e3fee58c271 diff --git a/tests/expected/blkid/low-probe-udf-hdd-win7 b/tests/expected/blkid/low-probe-udf-hdd-win7 index b003b754d1..1184212ab1 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-win7 +++ b/tests/expected/blkid/low-probe-udf-hdd-win7 @@ -1,4 +1,4 @@ -ID_FS_APPLICATION_ID=Microsoft Windows +ID_FS_APPLICATION_ID=Microsoft\x20Windows ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=My_volume_label ID_FS_LABEL_ENC=My\x20volume\x20label @@ -9,4 +9,4 @@ ID_FS_UUID=103a3b3b20554446 ID_FS_UUID_ENC=103a3b3b20554446 ID_FS_VERSION=2.01 ID_FS_VOLUME_ID=UDF Volume -ID_FS_VOLUME_SET_ID=103A3B3B UDF Volume Set +ID_FS_VOLUME_SET_ID=103A3B3B\x20UDF\x20Volume\x20Set diff --git a/tests/expected/blkid/low-probe-udf-multi-mkudffs-0 b/tests/expected/blkid/low-probe-udf-multi-mkudffs-0 index 87a8bd258e..138b457b18 100644 --- a/tests/expected/blkid/low-probe-udf-multi-mkudffs-0 +++ b/tests/expected/blkid/low-probe-udf-multi-mkudffs-0 @@ -1,9 +1,9 @@ -ID_FS_APPLICATION_ID=Linux mkudffs +ID_FS_APPLICATION_ID=Linux\x20mkudffs ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=first_session ID_FS_LABEL_ENC=first\x20session ID_FS_LOGICAL_VOLUME_ID=first session -ID_FS_PUBLISHER_ID=Linux mkudffs 2.2 +ID_FS_PUBLISHER_ID=Linux\x20mkudffs\x202.2 ID_FS_TYPE=udf ID_FS_USAGE=filesystem ID_FS_UUID=5fa6f31ee7b7f813 diff --git a/tests/expected/blkid/low-probe-udf-multi-mkudffs-320 b/tests/expected/blkid/low-probe-udf-multi-mkudffs-320 index 1576ecec25..2409ac1ff2 100644 --- a/tests/expected/blkid/low-probe-udf-multi-mkudffs-320 +++ b/tests/expected/blkid/low-probe-udf-multi-mkudffs-320 @@ -1,9 +1,9 @@ -ID_FS_APPLICATION_ID=Linux mkudffs +ID_FS_APPLICATION_ID=Linux\x20mkudffs ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=second_session ID_FS_LABEL_ENC=second\x20session ID_FS_LOGICAL_VOLUME_ID=second session -ID_FS_PUBLISHER_ID=Linux mkudffs 2.2 +ID_FS_PUBLISHER_ID=Linux\x20mkudffs\x202.2 ID_FS_TYPE=udf ID_FS_USAGE=filesystem ID_FS_UUID=5fa6f32c75d6d6a6 diff --git a/tests/expected/blkid/low-probe-udf-multi-mkudffs-640 b/tests/expected/blkid/low-probe-udf-multi-mkudffs-640 index c7784cd3f0..05bb56ca51 100644 --- a/tests/expected/blkid/low-probe-udf-multi-mkudffs-640 +++ b/tests/expected/blkid/low-probe-udf-multi-mkudffs-640 @@ -1,9 +1,9 @@ -ID_FS_APPLICATION_ID=Linux mkudffs +ID_FS_APPLICATION_ID=Linux\x20mkudffs ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=third_session ID_FS_LABEL_ENC=third\x20session ID_FS_LOGICAL_VOLUME_ID=third session -ID_FS_PUBLISHER_ID=Linux mkudffs 2.2 +ID_FS_PUBLISHER_ID=Linux\x20mkudffs\x202.2 ID_FS_TYPE=udf ID_FS_USAGE=filesystem ID_FS_UUID=5fa6f33b0f78bab0 -- 2.47.3