From: Kay Sievers <kay.sievers@vrfy.org>
Date: Mon, 26 Nov 2007 00:09:03 +0000 (+0100)
Subject: libvolume_id: squashfs - add endianess support for LZMA compression
X-Git-Tag: 174~1779
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e8b8e564ca66c11b79278156b834920219d9845;p=systemd

libvolume_id: squashfs - add endianess support for LZMA compression
---

diff --git a/extras/volume_id/lib/squashfs.c b/extras/volume_id/lib/squashfs.c
index 70b322df..035d6fb2 100644
--- a/extras/volume_id/lib/squashfs.c
+++ b/extras/volume_id/lib/squashfs.c
@@ -27,7 +27,7 @@
 #include "util.h"
 
 #define SQUASHFS_MAGIC		0x73717368
-#define SQUASHFS_MAGIC_LZMA	0x73687371
+#define SQUASHFS_MAGIC_LZMA	0x71736873
 
 struct squashfs_super {
 	uint32_t	s_magic;
@@ -51,21 +51,16 @@ int volume_id_probe_squashfs(struct volume_id *id, uint64_t off, uint64_t size)
 	if (sqs == NULL)
 		return -1;
 
-	if (sqs->s_magic == SQUASHFS_MAGIC) {
+	if (sqs->s_magic == SQUASHFS_MAGIC || sqs->s_magic == SQUASHFS_MAGIC_LZMA) {
 		snprintf(id->type_version, sizeof(id->type_version), "%u.%u",
 			 sqs->s_major, sqs->s_minor);
 		goto found;
 	}
-	if (sqs->s_magic == bswap_32(SQUASHFS_MAGIC)) {
+	if (sqs->s_magic == bswap_32(SQUASHFS_MAGIC) || sqs->s_magic == bswap_32(SQUASHFS_MAGIC_LZMA)) {
 		snprintf(id->type_version, sizeof(id->type_version), "%u.%u",
 			 bswap_16(sqs->s_major), bswap_16(sqs->s_minor));
 		goto found;
 	}
-	if (sqs->s_magic == bswap_32(SQUASHFS_MAGIC_LZMA)) {
-		snprintf(id->type_version, sizeof(id->type_version), "%u.%u",
-		sqs->s_major, sqs->s_minor);
-		goto found;
-	}
 
 	return -1;