X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Fsquashfs.c;h=18e44abcb4f28af2c003413bca5de05d4f0fe3b4;hb=726687ad48bdececed1e7e44387c50e009e28208;hp=fdba64edbce025b76c9e577794e9c2bcbe63335a;hpb=f7dd3a57a40282f1c3fb9ad90a30d58b31b64ff8;p=elogind.git

diff --git a/extras/volume_id/lib/squashfs.c b/extras/volume_id/lib/squashfs.c
index fdba64edb..18e44abcb 100644
--- a/extras/volume_id/lib/squashfs.c
+++ b/extras/volume_id/lib/squashfs.c
@@ -27,26 +27,45 @@
 #include "util.h"
 
 #define SQUASHFS_MAGIC		0x73717368
+#define SQUASHFS_MAGIC_LZMA	0x71736873
 
 struct squashfs_super {
-	uint32_t		s_magic;
+	uint32_t	s_magic;
+	uint32_t	inodes;
+	uint32_t	bytes_used_2;
+	uint32_t	uid_start_2;
+	uint32_t	guid_start_2;
+	uint32_t	inode_table_start_2;
+	uint32_t	directory_table_start_2;
+	uint16_t	s_major;
+	uint16_t	s_minor;
 } PACKED;
 
-int volume_id_probe_squashfs(struct volume_id *id, uint64_t off)
+int volume_id_probe_squashfs(struct volume_id *id, uint64_t off, uint64_t size)
 {
 	struct squashfs_super *sqs;
 
-	info("probing at offset 0x%llx", (unsigned long long) off);
+	info("probing at offset 0x%llx\n", (unsigned long long) off);
 
-	sqs = (struct squashfs_super *) volume_id_get_buffer(id, off + 0x200, 0x200);
+	sqs = (struct squashfs_super *) volume_id_get_buffer(id, off, 0x200);
 	if (sqs == NULL)
 		return -1;
 
-	if (sqs->s_magic == SQUASHFS_MAGIC || sqs->s_magic == bswap_32(SQUASHFS_MAGIC)) {
-		volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-		id->type = "squashfs";
-		return 0;
+	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) || 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;
 	}
 
 	return -1;
+
+found:
+	volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
+	id->type = "squashfs";
+	return 0;
 }