summaryrefslogtreecommitdiffstats
path: root/libblkid
diff options
context:
space:
mode:
authorKarel Zak2017-11-21 12:42:35 +0100
committerKarel Zak2017-11-21 12:42:35 +0100
commit6e08d4d9f8ff890c4dde004c1c9fd65f85d9ffef (patch)
treecb6b33d655544f1ec92d1c559ac30d25f9b8ef69 /libblkid
parentlibmount: add nsfs between pseudo filesystems (diff)
parentlibblkid: udf: Fix parsing UDF revision (diff)
downloadkernel-qcow2-util-linux-6e08d4d9f8ff890c4dde004c1c9fd65f85d9ffef.tar.gz
kernel-qcow2-util-linux-6e08d4d9f8ff890c4dde004c1c9fd65f85d9ffef.tar.xz
kernel-qcow2-util-linux-6e08d4d9f8ff890c4dde004c1c9fd65f85d9ffef.zip
Merge branch 'master' of https://github.com/pali/util-linux
* 'master' of https://github.com/pali/util-linux: libblkid: udf: Fix parsing UDF revision
Diffstat (limited to 'libblkid')
-rw-r--r--libblkid/src/superblocks/udf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libblkid/src/superblocks/udf.c b/libblkid/src/superblocks/udf.c
index 756fbcf63..bd8e0a5c2 100644
--- a/libblkid/src/superblocks/udf.c
+++ b/libblkid/src/superblocks/udf.c
@@ -450,7 +450,9 @@ real_blksz:
}
if (udf_rev)
- blkid_probe_sprintf_version(pr, "%d.%02d", (int)(udf_rev >> 8), (int)(udf_rev & 0xFF));
+ /* UDF revision is stored as decimal number in hexadecimal format.
+ * E.g. number 0x0150 is revision 1.50, number 0x0201 is revision 2.01. */
+ blkid_probe_sprintf_version(pr, "%x.%02x", (unsigned int)(udf_rev >> 8), (unsigned int)(udf_rev & 0xFF));
return 0;
}