Adjust how macOS drives are analysed and add a couple of tests.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/lib/cross.h b/src/lib/cross.h
index cc902232c..f1d0943fa 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -142,19 +142,17 @@ void disk_write_finished ();
 
 struct OSXMediaPath
 {
-	bool real;       ///< true for a "real" disk, false for a synthesized APFS one
-	std::string prt; ///< "PRT" entry from the media path
+	bool real; ///< true for a "real" disk, false for a synthesized APFS one
+	std::vector<std::string> parts; ///< parts of the media path after the :
 };
 
 
-
 struct OSXDisk
 {
-	std::string mount_point;
+	std::string device;
 	boost::optional<std::string> vendor;
 	boost::optional<std::string> model;
-	bool real;
-	std::string prt;
+	OSXMediaPath media_path;
 	bool whole;
 	std::vector<boost::filesystem::path> mount_points;
 	unsigned long size;