summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2021-09-02 18:07:46 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2021-09-02 18:07:46 +0000
commitee25c0fda93ca39e297a272bb92d0b53fea068bf (patch)
tree5a01be93611b84f5fb2a55108b5ebb64427ec691 /sbin
parentf0ae9b4b30750ae1fc455e0dc27eb609c4da3f5d (diff)
Split part_type into separate types 'mbr_type' and 'gpt_type',
shrinking static data demands. Split PRT_printall() into PRT_print_mbrtypes() and PRT_print_gpttypes() to eliminate pointless 'pseudo' MBR partition types and pointless display of MBR partition types with no associated GPT GUIDs. Eases future MBR and GPT partition type editing improvements. ok kettenis@
Diffstat (limited to 'sbin')
-rw-r--r--sbin/fdisk/cmd.c6
-rw-r--r--sbin/fdisk/part.c338
-rw-r--r--sbin/fdisk/part.h5
3 files changed, 201 insertions, 148 deletions
diff --git a/sbin/fdisk/cmd.c b/sbin/fdisk/cmd.c
index 5153b672781..c2763fb94c8 100644
--- a/sbin/fdisk/cmd.c
+++ b/sbin/fdisk/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.143 2021/09/01 20:08:32 krw Exp $ */
+/* $OpenBSD: cmd.c,v 1.144 2021/09/02 18:07:45 krw Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -613,7 +613,7 @@ ask_pid(const int dflt)
if (strlen(lbuf) == 0)
return dflt;
if (strcmp(lbuf, "?") == 0) {
- PRT_printall();
+ PRT_print_mbrtypes();
continue;
}
@@ -659,7 +659,7 @@ ask_uuid(const struct uuid *olduuid)
string_from_line(lbuf, sizeof(lbuf), TRIMMED);
if (strcmp(lbuf, "?") == 0) {
- PRT_printall();
+ PRT_print_gpttypes();
continue;
} else if (strlen(lbuf) == 0) {
uuid = *olduuid;
diff --git a/sbin/fdisk/part.c b/sbin/fdisk/part.c
index f3836000ae0..ad0d3c237a6 100644
--- a/sbin/fdisk/part.c
+++ b/sbin/fdisk/part.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: part.c,v 1.104 2021/08/27 11:28:22 krw Exp $ */
+/* $OpenBSD: part.c,v 1.105 2021/09/02 18:07:45 krw Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -33,123 +33,152 @@
int check_chs(const struct prt *);
const char *ascii_id(const int);
-static const struct part_type {
- int pt_type;
- char pt_sname[14];
- char pt_guid[UUID_STR_LEN + 1];
-} part_types[] = {
- { 0x00, "unused ", "00000000-0000-0000-0000-000000000000" },
- { 0x01, "FAT12 ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
- { 0x02, "XENIX / "}, /* XENIX / filesystem */
- { 0x03, "XENIX /usr "}, /* XENIX /usr filesystem */
- { 0x04, "FAT16S ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
- { 0x05, "Extended DOS"}, /* Extended DOS */
- { 0x06, "FAT16B ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
- { 0x07, "NTFS ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
- { 0x08, "AIX fs "}, /* AIX filesystem */
- { 0x09, "AIX/Coherent"}, /* AIX boot partition or Coherent */
- { 0x0A, "OS/2 Bootmgr"}, /* OS/2 Boot Manager or OPUS */
- { 0x0B, "FAT32 ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
- { 0x0C, "FAT32L ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
- { 0x0D, "BIOS Boot ", "21686148-6449-6e6f-744e-656564454649" },
- { 0x0E, "FAT16L ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
- { 0x0F, "Extended LBA"}, /* Extended DOS LBA-mapped */
- { 0x10, "OPUS "}, /* OPUS */
- { 0x11, "OS/2 hidden ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
- { 0x12, "Compaq Diag."}, /* Compaq Diagnostics */
- { 0x14, "OS/2 hidden ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
- { 0x16, "OS/2 hidden ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
- { 0x17, "OS/2 hidden ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
- { 0x18, "AST swap "}, /* AST Windows swapfile */
- { 0x19, "Willowtech "}, /* Willowtech Photon coS */
- { 0x1C, "ThinkPad Rec", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
- { 0x24, "NEC DOS "}, /* NEC DOS */
- { 0x27, "Win Recovery", "de94bba4-06d1-4d40-a16a-bfd50179d6ac" },
- { 0x20, "Willowsoft "}, /* Willowsoft OFS1 */
- { 0x38, "Theos "}, /* Theos */
- { 0x39, "Plan 9 "}, /* Plan 9 */
- { 0x40, "VENIX 286 "}, /* VENIX 286 or LynxOS */
- { 0x41, "Lin/Minux DR"}, /* Linux/MINIX (sharing disk with DRDOS) or Personal RISC boot */
- { 0x42, "LinuxSwap DR", "af9b60a0-1431-4f62-bc68-3311714a69ad" },
- { 0x43, "Linux DR "}, /* Linux native (sharing disk with DRDOS) */
- { 0x4D, "QNX 4.2 Pri "}, /* QNX 4.2 Primary */
- { 0x4E, "QNX 4.2 Sec "}, /* QNX 4.2 Secondary */
- { 0x4F, "QNX 4.2 Ter "}, /* QNX 4.2 Tertiary */
- { 0x50, "DM "}, /* DM (disk manager) */
- { 0x51, "DM "}, /* DM6 Aux1 (or Novell) */
- { 0x52, "CP/M or SysV"}, /* CP/M or Microport SysV/AT */
- { 0x53, "DM "}, /* DM6 Aux3 */
- { 0x54, "Ontrack "}, /* Ontrack */
- { 0x55, "EZ-Drive "}, /* EZ-Drive (disk manager) */
- { 0x56, "Golden Bow "}, /* Golden Bow (disk manager) */
- { 0x5C, "Priam "}, /* Priam Edisk (disk manager) */
- { 0x61, "SpeedStor "}, /* SpeedStor */
- { 0x63, "ISC, HURD, *"}, /* ISC, System V/386, GNU HURD or Mach */
- { 0x64, "NetWare 2.xx"}, /* Novell NetWare 2.xx */
- { 0x65, "NetWare 3.xx"}, /* Novell NetWare 3.xx */
- { 0x66, "NetWare 386 "}, /* Novell 386 NetWare */
- { 0x67, "Novell "}, /* Novell */
- { 0x68, "Novell "}, /* Novell */
- { 0x69, "Novell "}, /* Novell */
- { 0x70, "DiskSecure "}, /* DiskSecure Multi-Boot */
- { 0x75, "PCIX "}, /* PCIX */
- { 0x7f, "ChromeKernel", "fe3a2a5d-4f32-41a7-b725-accc3285a309" },
- { 0x80, "Minix (old) "}, /* Minix 1.1 ... 1.4a */
- { 0x81, "Minix (new) "}, /* Minix 1.4b ... 1.5.10 */
- { 0x82, "Linux swap ", "0657fd6d-a4ab-43c4-84e5-0933c84b4f4f" },
- { 0x83, "Linux files*", "0fc63daf-8483-4772-8e79-3d69d8477de4" },
- { 0x84, "OS/2 hidden "}, /* OS/2 hidden C: drive */
- { 0x85, "Linux ext. "}, /* Linux extended */
- { 0x86, "NT FAT VS "}, /* NT FAT volume set */
- { 0x87, "NTFS VS "}, /* NTFS volume set or HPFS mirrored */
- { 0x8E, "Linux LVM ", "e6d6d379-f507-44c2-a23c-238f2a3df928" },
- { 0x93, "Amoeba FS "}, /* Amoeba filesystem */
- { 0x94, "Amoeba BBT "}, /* Amoeba bad block table */
- { 0x99, "Mylex "}, /* Mylex EISA SCSI */
- { 0x9F, "BSDI "}, /* BSDI BSD/OS */
- { 0xA0, "NotebookSave"}, /* Phoenix NoteBIOS save-to-disk */
- { 0xA5, "FreeBSD ", "516e7cb4-6ecf-11d6-8ff8-00022d09712b" },
- { 0xA6, "OpenBSD ", "824cc7a0-36a8-11e3-890a-952519ad3f61" },
- { 0xA7, "NEXTSTEP "}, /* NEXTSTEP */
- { 0xA8, "MacOS X ", "55465300-0000-11aa-aa11-00306543ecac" },
- { 0xA9, "NetBSD ", "516e7cb4-6ecf-11d6-8ff8-00022d09712b" },
- { 0xAB, "MacOS X boot", "426f6f74-0000-11aa-aa11-00306543ecac" },
- { 0xAF, "MacOS X HFS+", "48465300-0000-11aa-aa11-00306543ecac" },
- { 0xB0, "APFS ", "7c3457ef-0000-11aa-aa11-00306543ecac" },
- { 0xB1, "APFS ISC ", "69646961-6700-11aa-aa11-00306543ecac" },
- { 0xB2, "APFS Recovry", "52637672-7900-11aa-aa11-00306543ecac" },
- { 0xB3, "HiFive FSBL ", "5b193300-fc78-40cd-8002-e86c45580b47" },
- { 0xB4, "HiFive BBL ", "2e54b353-1271-4842-806f-e436d6af6985" },
- { 0xB7, "BSDI filesy*"}, /* BSDI BSD/386 filesystem */
- { 0xB8, "BSDI swap "}, /* BSDI BSD/386 swap */
- { 0xBF, "Solaris ", "6a85cf4d-1dd2-11b2-99a6-080020736631" },
- { 0xC0, "CTOS "}, /* CTOS */
- { 0xC1, "DRDOSs FAT12"}, /* DRDOS/sec (FAT-12) */
- { 0xC4, "DRDOSs < 32M"}, /* DRDOS/sec (FAT-16, < 32M) */
- { 0xC6, "DRDOSs >=32M"}, /* DRDOS/sec (FAT-16, >= 32M) */
- { 0xC7, "HPFS Disbled"}, /* Syrinx (Cyrnix?) or HPFS disabled */
- { 0xDB, "CPM/C.DOS/C*"}, /* Concurrent CPM or C.DOS or CTOS */
- { 0xDE, "Dell Maint "}, /* Dell maintenance partition */
- { 0xE1, "SpeedStor "}, /* DOS access or SpeedStor 12-bit FAT extended partition */
- { 0xE3, "SpeedStor "}, /* DOS R/O or SpeedStor or Storage Dimensions */
- { 0xE4, "SpeedStor "}, /* SpeedStor 16-bit FAT extended partition < 1024 cyl. */
- { 0xEB, "BeOS/i386 ", "42465331-3ba3-10f1-802a-4861696b7521" },
- { 0xEE, "EFI GPT "}, /* EFI Protective Partition */
- { 0xEF, "EFI Sys ", "c12a7328-f81f-11d2-ba4b-00a0c93ec93b" },
- { 0xF1, "SpeedStor "}, /* SpeedStor or Storage Dimensions */
- { 0xF2, "DOS 3.3+ Sec"}, /* DOS 3.3+ Secondary */
- { 0xF4, "SpeedStor "}, /* SpeedStor >1024 cyl. or LANstep or IBM PS/2 IML */
- { 0xFF, "Xenix BBT "}, /* Xenix Bad Block Table */
+struct mbr_type {
+ int mt_type;
+ char mt_sname[14];
};
-static const struct protected_guid {
- char pg_guid[UUID_STR_LEN + 1];
-} protected_guid[] = {
- { "7c3457ef-0000-11aa-aa11-00306543ecac" }, /* APFS */
- { "69646961-6700-11aa-aa11-00306543ecac" }, /* APFS ISC */
- { "52637672-7900-11aa-aa11-00306543ecac" }, /* APFS Recovry */
- { "5b193300-fc78-40cd-8002-e86c45580b47" }, /* HiFive FSBL */
- { "2e54b353-1271-4842-806f-e436d6af6985" }, /* HiFive BBL */
+const struct mbr_type mbr_types[] = {
+ { 0x00, "unused " }, /* unused */
+ { 0x01, "DOS FAT-12 " }, /* Primary DOS with 12 bit FAT */
+ { 0x02, "XENIX / " }, /* XENIX / filesystem */
+ { 0x03, "XENIX /usr " }, /* XENIX /usr filesystem */
+ { 0x04, "DOS FAT-16 " }, /* Primary DOS with 16 bit FAT */
+ { 0x05, "Extended DOS" }, /* Extended DOS */
+ { 0x06, "DOS > 32MB " }, /* Primary 'big' DOS (> 32MB) */
+ { 0x07, "NTFS " }, /* NTFS */
+ { 0x08, "AIX fs " }, /* AIX filesystem */
+ { 0x09, "AIX/Coherent" }, /* AIX boot partition or Coherent */
+ { 0x0A, "OS/2 Bootmgr" }, /* OS/2 Boot Manager or OPUS */
+ { 0x0B, "Win95 FAT-32" }, /* Primary Win95 w/ 32-bit FAT */
+ { 0x0C, "Win95 FAT32L" }, /* Primary Win95 w/ 32-bit FAT LBA-mapped */
+ { 0x0E, "DOS FAT-16 " }, /* Primary DOS w/ 16-bit FAT, CHS-mapped */
+ { 0x0F, "Extended LBA" }, /* Extended DOS LBA-mapped */
+ { 0x10, "OPUS " }, /* OPUS */
+ { 0x11, "OS/2 hidden " }, /* OS/2 BM: hidden DOS 12-bit FAT */
+ { 0x12, "Compaq Diag." }, /* Compaq Diagnostics */
+ { 0x14, "OS/2 hidden " }, /* OS/2 BM: hidden DOS 16-bit FAT <32M or Novell DOS 7.0 bug */
+ { 0x16, "OS/2 hidden " }, /* OS/2 BM: hidden DOS 16-bit FAT >=32M */
+ { 0x17, "OS/2 hidden " }, /* OS/2 BM: hidden IFS */
+ { 0x18, "AST swap " }, /* AST Windows swapfile */
+ { 0x19, "Willowtech " }, /* Willowtech Photon coS */
+ { 0x1C, "ThinkPad Rec" }, /* IBM ThinkPad recovery partition */
+ { 0x20, "Willowsoft " }, /* Willowsoft OFS1 */
+ { 0x24, "NEC DOS " }, /* NEC DOS */
+ { 0x27, "Win Recovery" }, /* Windows hidden Recovery Partition */
+ { 0x38, "Theos " }, /* Theos */
+ { 0x39, "Plan 9 " }, /* Plan 9 */
+ { 0x40, "VENIX 286 " }, /* VENIX 286 or LynxOS */
+ { 0x41, "Lin/Minux DR" }, /* Linux/MINIX (sharing disk with DRDOS) or Personal RISC boot */
+ { 0x42, "LinuxSwap DR" }, /* SFS or Linux swap (sharing disk with DRDOS) */
+ { 0x43, "Linux DR " }, /* Linux native (sharing disk with DRDOS) */
+ { 0x4D, "QNX 4.2 Pri " }, /* QNX 4.2 Primary */
+ { 0x4E, "QNX 4.2 Sec " }, /* QNX 4.2 Secondary */
+ { 0x4F, "QNX 4.2 Ter " }, /* QNX 4.2 Tertiary */
+ { 0x50, "DM " }, /* DM (disk manager) */
+ { 0x51, "DM " }, /* DM6 Aux1 (or Novell) */
+ { 0x52, "CP/M or SysV" }, /* CP/M or Microport SysV/AT */
+ { 0x53, "DM " }, /* DM6 Aux3 */
+ { 0x54, "Ontrack " }, /* Ontrack */
+ { 0x55, "EZ-Drive " }, /* EZ-Drive (disk manager) */
+ { 0x56, "Golden Bow " }, /* Golden Bow (disk manager) */
+ { 0x5C, "Priam " }, /* Priam Edisk (disk manager) */
+ { 0x61, "SpeedStor " }, /* SpeedStor */
+ { 0x63, "ISC, HURD, *" }, /* ISC, System V/386, GNU HURD or Mach */
+ { 0x64, "NetWare 2.xx" }, /* Novell NetWare 2.xx */
+ { 0x65, "NetWare 3.xx" }, /* Novell NetWare 3.xx */
+ { 0x66, "NetWare 386 " }, /* Novell 386 NetWare */
+ { 0x67, "Novell " }, /* Novell */
+ { 0x68, "Novell " }, /* Novell */
+ { 0x69, "Novell " }, /* Novell */
+ { 0x70, "DiskSecure " }, /* DiskSecure Multi-Boot */
+ { 0x75, "PCIX " }, /* PCIX */
+ { 0x80, "Minix (old) " }, /* Minix 1.1 ... 1.4a */
+ { 0x81, "Minix (new) " }, /* Minix 1.4b ... 1.5.10 */
+ { 0x82, "Linux swap " }, /* Linux swap */
+ { 0x83, "Linux files*" }, /* Linux filesystem */
+ { 0x84, "OS/2 hidden " }, /* OS/2 hidden C: drive */
+ { 0x85, "Linux ext. " }, /* Linux extended */
+ { 0x86, "NT FAT VS " }, /* NT FAT volume set */
+ { 0x87, "NTFS VS " }, /* NTFS volume set or HPFS mirrored */
+ { 0x8E, "Linux LVM " }, /* Linux LVM */
+ { 0x93, "Amoeba FS " }, /* Amoeba filesystem */
+ { 0x94, "Amoeba BBT " }, /* Amoeba bad block table */
+ { 0x99, "Mylex " }, /* Mylex EISA SCSI */
+ { 0x9F, "BSDI " }, /* BSDI BSD/OS */
+ { 0xA0, "NotebookSave" }, /* Phoenix NoteBIOS save-to-disk */
+ { 0xA5, "FreeBSD " }, /* FreeBSD */
+ { 0xA6, "OpenBSD " }, /* OpenBSD */
+ { 0xA7, "NEXTSTEP " }, /* NEXTSTEP */
+ { 0xA8, "MacOS X " }, /* MacOS X main partition */
+ { 0xA9, "NetBSD " }, /* NetBSD */
+ { 0xAB, "MacOS X boot" }, /* MacOS X boot partition */
+ { 0xAF, "MacOS X HFS+" }, /* MacOS X HFS+ partition */
+ { 0xB7, "BSDI filesy*" }, /* BSDI BSD/386 filesystem */
+ { 0xB8, "BSDI swap " }, /* BSDI BSD/386 swap */
+ { 0xBF, "Solaris " }, /* Solaris */
+ { 0xC0, "CTOS " }, /* CTOS */
+ { 0xC1, "DRDOSs FAT12" }, /* DRDOS/sec (FAT-12) */
+ { 0xC4, "DRDOSs < 32M" }, /* DRDOS/sec (FAT-16, < 32M) */
+ { 0xC6, "DRDOSs >=32M" }, /* DRDOS/sec (FAT-16, >= 32M) */
+ { 0xC7, "HPFS Disbled" }, /* Syrinx (Cyrnix?) or HPFS disabled */
+ { 0xDB, "CPM/C.DOS/C*" }, /* Concurrent CPM or C.DOS or CTOS */
+ { 0xDE, "Dell Maint " }, /* Dell maintenance partition */
+ { 0xE1, "SpeedStor " }, /* DOS access or SpeedStor 12-bit FAT extended partition */
+ { 0xE3, "SpeedStor " }, /* DOS R/O or SpeedStor or Storage Dimensions */
+ { 0xE4, "SpeedStor " }, /* SpeedStor 16-bit FAT extended partition < 1024 cyl. */
+ { 0xEB, "BeOS/i386 " }, /* BeOS for Intel */
+ { 0xEE, "EFI GPT " }, /* EFI Protective Partition */
+ { 0xEF, "EFI Sys " }, /* EFI System Partition */
+ { 0xF1, "SpeedStor " }, /* SpeedStor or Storage Dimensions */
+ { 0xF2, "DOS 3.3+ Sec" }, /* DOS 3.3+ Secondary */
+ { 0xF4, "SpeedStor " }, /* SpeedStor >1024 cyl. or LANstep or IBM PS/2 IML */
+ { 0xFF, "Xenix BBT " }, /* Xenix Bad Block Table */
+};
+
+struct gpt_type {
+ int gt_type;
+ int gt_protected;
+ char gt_sname[14];
+ char gt_guid[UUID_STR_LEN + 1];
+
+};
+
+const struct gpt_type gpt_types[] = {
+ { 0x00, 0, "unused ", "00000000-0000-0000-0000-000000000000" },
+ { 0x01, 0, "FAT12 ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
+ { 0x04, 0, "FAT16S ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
+ { 0x06, 0, "FAT16B ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
+ { 0x07, 0, "NTFS ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
+ { 0x0B, 0, "FAT32 ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
+ { 0x0C, 0, "FAT32L ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
+ { 0x0D, 0, "BIOS Boot ", "21686148-6449-6e6f-744e-656564454649" },
+ { 0x0E, 0, "FAT16L ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
+ { 0x11, 0, "OS/2 hidden ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
+ { 0x14, 0, "OS/2 hidden ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
+ { 0x16, 0, "OS/2 hidden ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
+ { 0x17, 0, "OS/2 hidden ", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
+ { 0x1C, 0, "ThinkPad Rec", "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7" },
+ { 0x27, 0, "Win Recovery", "de94bba4-06d1-4d40-a16a-bfd50179d6ac" },
+ { 0x42, 0, "LinuxSwap DR", "af9b60a0-1431-4f62-bc68-3311714a69ad" },
+ { 0x7f, 0, "ChromeKernel", "fe3a2a5d-4f32-41a7-b725-accc3285a309" },
+ { 0x82, 0, "Linux swap ", "0657fd6d-a4ab-43c4-84e5-0933c84b4f4f" },
+ { 0x83, 0, "Linux files*", "0fc63daf-8483-4772-8e79-3d69d8477de4" },
+ { 0x8E, 0, "Linux LVM ", "e6d6d379-f507-44c2-a23c-238f2a3df928" },
+ { 0xA5, 0, "FreeBSD ", "516e7cb4-6ecf-11d6-8ff8-00022d09712b" },
+ { 0xA6, 0, "OpenBSD ", "824cc7a0-36a8-11e3-890a-952519ad3f61" },
+ { 0xA8, 0, "MacOS X ", "55465300-0000-11aa-aa11-00306543ecac" },
+ { 0xA9, 0, "NetBSD ", "516e7cb4-6ecf-11d6-8ff8-00022d09712b" },
+ { 0xAB, 0, "MacOS X boot", "426f6f74-0000-11aa-aa11-00306543ecac" },
+ { 0xAF, 0, "MacOS X HFS+", "48465300-0000-11aa-aa11-00306543ecac" },
+ { 0xB0, 1, "APFS ", "7c3457ef-0000-11aa-aa11-00306543ecac" },
+ { 0xB1, 1, "APFS ISC ", "69646961-6700-11aa-aa11-00306543ecac" },
+ { 0xB2, 1, "APFS Recovry", "52637672-7900-11aa-aa11-00306543ecac" },
+ { 0xB3, 1, "HiFive FSBL ", "5b193300-fc78-40cd-8002-e86c45580b47" },
+ { 0xB4, 1, "HiFive BBL ", "2e54b353-1271-4842-806f-e436d6af6985" },
+ { 0xBF, 0, "Solaris ", "6a85cf4d-1dd2-11b2-99a6-080020736631" },
+ { 0xEB, 0, "BeOS/i386 ", "42465331-3ba3-10f1-802a-4861696b7521" },
+ { 0xEF, 0, "EFI Sys ", "c12a7328-f81f-11d2-ba4b-00a0c93ec93b" },
};
int
@@ -166,9 +195,10 @@ PRT_protected_guid(const struct uuid *uuid)
goto done;
}
- for(i = 0; i < nitems(protected_guid); i++) {
- if (strncmp(str, protected_guid[i].pg_guid, UUID_STR_LEN) == 0) {
- rslt = -1;
+ for(i = 0; i < nitems(gpt_types); i++) {
+ if (strncmp(str, gpt_types[i].gt_guid, UUID_STR_LEN) == 0) {
+ if (gpt_types[i].gt_protected)
+ rslt = -1;
break;
}
}
@@ -179,22 +209,44 @@ PRT_protected_guid(const struct uuid *uuid)
}
void
-PRT_printall(void)
+PRT_print_mbrtypes(void)
+{
+ unsigned int i, idrows;
+
+ idrows = (nitems(mbr_types) + 3) / 4;
+
+ printf("Choose from the following Partition id values:\n");
+ for (i = 0; i < idrows; i++) {
+ printf("%02X %s %02X %s %02X %s",
+ mbr_types[i].mt_type, mbr_types[i].mt_sname,
+ mbr_types[i+idrows].mt_type, mbr_types[i+idrows].mt_sname,
+ mbr_types[i+idrows*2].mt_type, mbr_types[i+idrows*2].mt_sname);
+ if ((i+idrows*3) < nitems(mbr_types)) {
+ printf(" %02X %s\n",
+ mbr_types[i+idrows*3].mt_type,
+ mbr_types[i+idrows*3].mt_sname);
+ } else
+ printf( "\n" );
+ }
+}
+
+void
+PRT_print_gpttypes(void)
{
- int i, idrows;
+ unsigned int i, idrows;
- idrows = (nitems(part_types) + 3) / 4;
+ idrows = (nitems(gpt_types) + 3) / 4;
printf("Choose from the following Partition id values:\n");
for (i = 0; i < idrows; i++) {
printf("%02X %s %02X %s %02X %s",
- part_types[i].pt_type, part_types[i].pt_sname,
- part_types[i+idrows].pt_type, part_types[i+idrows].pt_sname,
- part_types[i+idrows*2].pt_type, part_types[i+idrows*2].pt_sname);
- if ((i+idrows*3) < nitems(part_types)) {
+ gpt_types[i].gt_type, gpt_types[i].gt_sname,
+ gpt_types[i+idrows].gt_type, gpt_types[i+idrows].gt_sname,
+ gpt_types[i+idrows*2].gt_type, gpt_types[i+idrows*2].gt_sname);
+ if ((i+idrows*3) < nitems(gpt_types)) {
printf(" %02X %s\n",
- part_types[i+idrows*3].pt_type,
- part_types[i+idrows*3].pt_sname);
+ gpt_types[i+idrows*3].gt_type,
+ gpt_types[i+idrows*3].gt_sname);
} else
printf( "\n" );
}
@@ -206,9 +258,9 @@ ascii_id(const int id)
static char unknown[] = "<Unknown ID>";
int i;
- for (i = 0; i < nitems(part_types); i++) {
- if (part_types[i].pt_type == id)
- return part_types[i].pt_sname;
+ for (i = 0; i < nitems(mbr_types); i++) {
+ if (mbr_types[i].mt_type == id)
+ return mbr_types[i].mt_sname;
}
return unknown;
@@ -420,16 +472,16 @@ PRT_uuid_to_typename(const struct uuid *uuid)
if (status != uuid_s_ok)
goto done;
- entries = nitems(part_types);
+ entries = nitems(gpt_types);
for (i = 0; i < entries; i++) {
- if (memcmp(part_types[i].pt_guid, uuidstr,
- sizeof(part_types[i].pt_guid)) == 0)
+ if (memcmp(gpt_types[i].gt_guid, uuidstr,
+ sizeof(gpt_types[i].gt_guid)) == 0)
break;
}
if (i < entries)
- strlcpy(partition_type, part_types[i].pt_sname,
+ strlcpy(partition_type, gpt_types[i].gt_sname,
sizeof(partition_type));
else
strlcpy(partition_type, uuidstr, sizeof(partition_type));
@@ -452,10 +504,10 @@ PRT_uuid_to_type(const struct uuid *uuid)
if (status != uuid_s_ok)
goto done;
- for (i = 0; i < nitems(part_types); i++) {
- if (memcmp(part_types[i].pt_guid, uuidstr,
- sizeof(part_types[i].pt_guid)) == 0) {
- type = part_types[i].pt_type;
+ for (i = 0; i < nitems(gpt_types); i++) {
+ if (memcmp(gpt_types[i].gt_guid, uuidstr,
+ sizeof(gpt_types[i].gt_guid)) == 0) {
+ type = gpt_types[i].gt_type;
break;
}
}
@@ -473,16 +525,16 @@ PRT_type_to_uuid(const int type)
memset(&guid, 0, sizeof(guid));
- entries = nitems(part_types);
+ entries = nitems(gpt_types);
for (i = 0; i < entries; i++) {
- if (part_types[i].pt_type == type)
+ if (gpt_types[i].gt_type == type)
break;
}
if (i < entries)
- uuid_from_string(part_types[i].pt_guid, &guid, &status);
+ uuid_from_string(gpt_types[i].gt_guid, &guid, &status);
if (i == entries || status != uuid_s_ok)
- uuid_from_string(part_types[0].pt_guid, &guid, &status);
+ uuid_from_string(gpt_types[0].gt_guid, &guid, &status);
return &guid;
}
diff --git a/sbin/fdisk/part.h b/sbin/fdisk/part.h
index 71baa85a4a1..e28921be125 100644
--- a/sbin/fdisk/part.h
+++ b/sbin/fdisk/part.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: part.h,v 1.29 2021/07/18 21:40:13 krw Exp $ */
+/* $OpenBSD: part.h,v 1.30 2021/09/02 18:07:45 krw Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -28,7 +28,8 @@ struct prt {
unsigned char prt_id;
};
-void PRT_printall(void);
+void PRT_print_mbrtypes(void);
+void PRT_print_gpttypes(void);
void PRT_parse(const struct dos_partition *, const uint64_t,
const uint64_t, struct prt *);
void PRT_make(const struct prt *,const uint64_t, const uint64_t,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 19:40:31 +0000