libblkid: Add very basic APFS recognition

diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index ea023070205fbdc7c0bc7112c22454747ebcbb1f..4109561c40fbdb5836dbc0707fa001686e9c7f37 100644 (file)
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -44,6 +44,7 @@ libblkid_la_SOURCES = \
        libblkid/src/partitions/unixware.c \
        \
        libblkid/src/superblocks/adaptec_raid.c \
+       libblkid/src/superblocks/apfs.c \
        libblkid/src/superblocks/bcache.c \
        libblkid/src/superblocks/befs.c \
        libblkid/src/superblocks/bfs.c \

diff --git a/libblkid/src/superblocks/apfs.c b/libblkid/src/superblocks/apfs.c
new file mode 100644 (file)
index 0000000..6303d9b
--- /dev/null
+++ b/libblkid/src/superblocks/apfs.c
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2018 Harry Mallon <hjmallon@gmail.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+
+#include "superblocks.h"
+
+const struct blkid_idinfo apfs_idinfo =
+{
+       .name           = "apfs",
+       .usage          = BLKID_USAGE_FILESYSTEM,
+       .magics         =
+       {
+               { .magic = "NXSB", .len = 4, .sboff = 32 },
+               { NULL }
+       }
+};

diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c
index 6dfd2be6493b180fde852ca9c0a39f9da544aec8..e95c1e626b95edf46873256faa1e5be12e299831 100644 (file)
--- a/libblkid/src/superblocks/superblocks.c
+++ b/libblkid/src/superblocks/superblocks.c
@@ -163,7 +163,8 @@ static const struct blkid_idinfo *idinfos[] =
        &nilfs2_idinfo,
        &exfat_idinfo,
        &f2fs_idinfo,
-       &mpool_idinfo
+       &mpool_idinfo,
+       &apfs_idinfo
 };
 
 /*

diff --git a/libblkid/src/superblocks/superblocks.h b/libblkid/src/superblocks/superblocks.h
index d677f85bca8c76996f9360af32f4a420734d6d85..85858b9fc52cb070e03321fc386033905c5a578a 100644 (file)
--- a/libblkid/src/superblocks/superblocks.h
+++ b/libblkid/src/superblocks/superblocks.h
@@ -82,6 +82,7 @@ extern const struct blkid_idinfo mpool_idinfo;
 extern const struct blkid_idinfo vdo_idinfo;
 extern const struct blkid_idinfo stratis_idinfo;
 extern const struct blkid_idinfo bitlocker_idinfo;
+extern const struct blkid_idinfo apfs_idinfo;
 
 /*
  * superblock functions