X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Flinux_swap.c;h=c4beeab978c9dc6711577280826087d3ed198645;hp=b63f1e6c002b622dc05f5366f20ec87039ef5d85;hb=fcd070d010de9ed803abec8899cefc399cfc5fe7;hpb=d5618ac96913efa0b52501b6a5c690bee6a33517

diff --git a/extras/volume_id/lib/linux_swap.c b/extras/volume_id/lib/linux_swap.c
index b63f1e6c0..c4beeab97 100644
--- a/extras/volume_id/lib/linux_swap.c
+++ b/extras/volume_id/lib/linux_swap.c
@@ -3,19 +3,24 @@
  *
  * Copyright (C) 2004 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,27 +29,28 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
-#include "util.h"
+#include "libvolume_id-private.h"
 
-static struct swap_header_v1_2 {
+struct swap_header_v1_2 {
 	uint8_t		bootbits[1024];
 	uint32_t	version;
 	uint32_t	last_page;
 	uint32_t	nr_badpages;
 	uint8_t		uuid[16];
 	uint8_t		volume_name[16];
-} PACKED *sw;
+} PACKED;
 
-#define LARGEST_PAGESIZE			0x4000
+#define LARGEST_PAGESIZE			0x10000
 
-int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off)
+int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off, uint64_t size)
 {
 	const uint8_t *buf;
 	unsigned int page;
+	struct swap_header_v1_2 *sw;
 
-	dbg("probing at offset 0x%llx", (unsigned long long) off);
+	info("probing at offset 0x%" PRIx64 "\n", off);
 
-	/* the swap signature is at the end of the PAGE_SIZE */
+	/* eek, the swap signature is at the end of the PAGE_SIZE */
 	for (page = 0x1000; page <= LARGEST_PAGESIZE; page <<= 1) {
 			buf = volume_id_get_buffer(id, off + page-10, 10);
 			if (buf == NULL)
@@ -56,21 +62,40 @@ int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off)
 			}
 
 			if (memcmp(buf, "SWAPSPACE2", 10) == 0) {
-				sw = (struct swap_header_v1_2 *) volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2));
-				if (sw == NULL)
-					return -1;
+				id->type = "swap";
 				strcpy(id->type_version, "2");
-				volume_id_set_label_raw(id, sw->volume_name, 16);
-				volume_id_set_label_string(id, sw->volume_name, 16);
-				volume_id_set_uuid(id, sw->uuid, UUID_DCE);
-				goto found;
+				goto found_label;
+			}
+
+			if (memcmp(buf, "S1SUSPEND", 9) == 0) {
+				id->type = "suspend";
+				strcpy(id->type_version, "s1suspend");
+				goto found_label;
+			}
+
+			if (memcmp(buf, "ULSUSPEND", 9) == 0) {
+				id->type = "suspend";
+				strcpy(id->type_version, "ulsuspend");
+				goto found_label;
+			}
+
+			if (memcmp(buf, "\xed\xc3\x02\xe9\x98\x56\xe5\x0c", 8) == 0) {
+				id->type = "suspend";
+				strcpy(id->type_version, "tuxonice");
+				goto found_label;
 			}
 	}
 	return -1;
 
+found_label:
+	sw = (struct swap_header_v1_2 *) volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2));
+	if (sw != NULL) {
+		volume_id_set_label_raw(id, sw->volume_name, 16);
+		volume_id_set_label_string(id, sw->volume_name, 16);
+		volume_id_set_uuid(id, sw->uuid, 0, UUID_DCE);
+	}
+
 found:
 	volume_id_set_usage(id, VOLUME_ID_OTHER);
-	id->type = "swap";
-
 	return 0;
 }