X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Fsquashfs.c;h=c4d961d31ee5f96c2cba6fc3fa4494329edf3895;hp=70b322df0c49bba5ee3ef92a42658dde1d5007d0;hb=d4f687c013a18010fdc2ddf937fad064343e635a;hpb=d7515c7bb95748f3afc2156451dd10f3e0ee4c84

diff --git a/extras/volume_id/lib/squashfs.c b/extras/volume_id/lib/squashfs.c
index 70b322df0..c4d961d31 100644
--- a/extras/volume_id/lib/squashfs.c
+++ b/extras/volume_id/lib/squashfs.c
@@ -3,19 +3,24 @@
  *
  * Copyright (C) 2006 Kay Sievers <kay.sievers@vrfy.org>
  *
- *	This program is free software; you can redistribute it and/or modify it
- *	under the terms of the GNU General Public License as published by the
- *	Free Software Foundation version 2 of the License.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -24,10 +29,10 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
-#include "util.h"
+#include "libvolume_id-private.h"
 
 #define SQUASHFS_MAGIC		0x73717368
-#define SQUASHFS_MAGIC_LZMA	0x73687371
+#define SQUASHFS_MAGIC_LZMA	0x71736873
 
 struct squashfs_super {
 	uint32_t	s_magic;
@@ -45,27 +50,22 @@ 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);
 	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;