From: Dave Vasilevsky Date: Wed, 1 Oct 2025 21:03:48 +0000 (-0400) Subject: fs/hfsplus: Allow reading files created by Mac OS 9 X-Git-Tag: grub-2.14-rc1~68 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8379e693b00ed523aac96230c778c773fcbb684;p=thirdparty%2Fgrub.git fs/hfsplus: Allow reading files created by Mac OS 9 The "permissions" field of hfsplus files is only used by Mac OS X. This causes GRUB to skip reading files created by Mac OS 9, since their file mode is read as unknown. Instead, assume files with zero mode are regular files. From Technote 1150: The traditional Mac OS implementation of HFS Plus does not use the permissions field. Files created by traditional Mac OS have the entire field set to 0. Signed-off-by: Dave Vasilevsky Reviewed-by: Daniel Kiper --- diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c index 3f203abcc..12d3f2641 100644 --- a/grub-core/fs/hfsplus.c +++ b/grub-core/fs/hfsplus.c @@ -736,7 +736,9 @@ list_nodes (void *record, void *hook_arg) int mode = (grub_be_to_cpu16 (fileinfo->mode) & GRUB_HFSPLUS_FILEMODE_MASK); - if (mode == GRUB_HFSPLUS_FILEMODE_REG) + if (mode == 0) /* Created by pre-Mac OS X. */ + type = GRUB_FSHELP_REG; + else if (mode == GRUB_HFSPLUS_FILEMODE_REG) type = GRUB_FSHELP_REG; else if (mode == GRUB_HFSPLUS_FILEMODE_SYMLINK) type = GRUB_FSHELP_SYMLINK;