X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Flibvolume_id%2Fvolume_id.c;h=fdecf396c4abadd090dd4f0828d32153dbf660de;hp=09d1e317257f66b9bc7291b2ae3f8201feaa3b5a;hb=2f567dd62ede3cf979e426738925446f1182ba52;hpb=f054627f500450a7aadeaf8a9930354fb268718e

diff --git a/extras/volume_id/libvolume_id/volume_id.c b/extras/volume_id/libvolume_id/volume_id.c
index 09d1e3172..fdecf396c 100644
--- a/extras/volume_id/libvolume_id/volume_id.c
+++ b/extras/volume_id/libvolume_id/volume_id.c
@@ -31,7 +31,7 @@
 #include "util.h"
 
 
-int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size)
+int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size)
 {
 	if (id == NULL)
 		return -EINVAL;
@@ -39,113 +39,141 @@ int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size)
 	/* probe for raid first, cause fs probes may be successful on raid members */
 	if (size) {
 		if (volume_id_probe_linux_raid(id, off, size) == 0)
-			goto exit;
+			goto found;
 
 		if (volume_id_probe_intel_software_raid(id, off, size) == 0)
-			goto exit;
+			goto found;
 
 		if (volume_id_probe_lsi_mega_raid(id, off, size) == 0)
-			goto exit;
+			goto found;
 
 		if (volume_id_probe_via_raid(id, off, size) == 0)
-			goto exit;
+			goto found;
 
 		if (volume_id_probe_silicon_medley_raid(id, off, size) == 0)
-			goto exit;
+			goto found;
 
 		if (volume_id_probe_nvidia_raid(id, off, size) == 0)
-			goto exit;
+			goto found;
 
 		if (volume_id_probe_promise_fasttrack_raid(id, off, size) == 0)
-			goto exit;
+			goto found;
 
 		if (volume_id_probe_highpoint_45x_raid(id, off, size) == 0)
-			goto exit;
+			goto found;
 	}
 
 	if (volume_id_probe_lvm1(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_lvm2(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_highpoint_37x_raid(id, off) == 0)
-		goto exit;
+		goto found;
+
+	return -1;
+
+found:
+	/* If recognized, we free the allocated buffers */
+	volume_id_free_buffer(id);
+	return 0;
+}
+
+int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size)
+{
+	if (id == NULL)
+		return -EINVAL;
 
 	if (volume_id_probe_luks(id, off) == 0)
-		goto exit;
+		goto found;
 
 	/* signature in the first block, only small buffer needed */
 	if (volume_id_probe_vfat(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_xfs(id, off) == 0)
-		goto exit;
+		goto found;
 
 	/* fill buffer with maximum */
 	volume_id_get_buffer(id, 0, SB_BUFFER_SIZE);
 
 	if (volume_id_probe_linux_swap(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_ext(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_reiserfs(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_jfs(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_udf(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_iso9660(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_hfs_hfsplus(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_ufs(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_ntfs(id, off)  == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_cramfs(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_romfs(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_hpfs(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_sysv(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_minix(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_ocfs1(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_ocfs2(id, off) == 0)
-		goto exit;
+		goto found;
 
 	if (volume_id_probe_vxfs(id, off) == 0)
-		goto exit;
+		goto found;
+
+	if (volume_id_probe_squashfs(id, off) == 0)
+		goto found;
 
 	return -1;
 
-exit:
-	/* If the filestystem in recognized, we free the allocated buffers,
-	   otherwise they will stay in place for the possible next probe call */
+found:
+	/* If recognized, we free the allocated buffers */
 	volume_id_free_buffer(id);
-
 	return 0;
 }
 
+int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size)
+{
+	if (id == NULL)
+		return -EINVAL;
+
+	if (volume_id_probe_raid(id, off, size) == 0)
+		return 0;
+
+	if (volume_id_probe_filesystem(id, off, size) == 0)
+		return 0;
+
+	return -1;
+}
+
 /* open volume by already open file descriptor */
 struct volume_id *volume_id_open_fd(int fd)
 {