]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
fs/hfsplus: Allow reading files created by Mac OS 9
authorDave Vasilevsky <dave@vasilevsky.ca>
Wed, 1 Oct 2025 21:03:48 +0000 (17:03 -0400)
committerDaniel Kiper <daniel.kiper@oracle.com>
Sat, 11 Oct 2025 13:43:58 +0000 (15:43 +0200)
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 <dave@vasilevsky.ca>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
grub-core/fs/hfsplus.c

index 3f203abccdd5015e99a658dbec6b8e3b5a421559..12d3f2641fe9d845491c56aa078d48de8d96fc12 100644 (file)
@@ -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;