vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/commands/macbless.c (grub_mac_bless_inode): Pass inode as u32

Browse source 
as both HFS and HFS+ have 32-bit inodes.
This commit is contained in:
Vladimir Serbinenko 2013-12-21 14:40:53 +01:00
parent 0d4aa91d0d
commit ab216512d7
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-12-21 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/macbless.c (grub_mac_bless_inode): Pass inode as
u32 as both HFS and HFS+ have 32-bit inodes.
2013-12-21 Vladimir Serbinenko <phcoder@gmail.com> 2013-12-21 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/misc.h (grub_strtol): Fix overflow. * include/grub/misc.h (grub_strtol): Fix overflow.

6
grub-core/commands/macbless.c
View file

@ -59,7 +59,7 @@ find_inode (const char *filename,
} }
grub_err_t grub_err_t
grub_mac_bless_inode (grub_device_t dev, grub_uint64_t inode, int is_dir, grub_mac_bless_inode (grub_device_t dev, grub_uint32_t inode, int is_dir,
int intel) int intel)
{ {
grub_err_t err; grub_err_t err;
@ -174,8 +174,8 @@ grub_mac_bless_file (grub_device_t dev, const char *path_in, int intel)
} }
grub_free (path); grub_free (path);
return grub_mac_bless_inode (dev, ctx.inode_found, (ctx.found == DIR), return grub_mac_bless_inode (dev, (grub_uint32_t) ctx.inode_found,
intel); (ctx.found == DIR), intel);
} }
static grub_err_t static grub_err_t

2
include/grub/hfsplus.h
View file

@ -247,7 +247,7 @@ grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree,
struct grub_hfsplus_btnode **matchnode, struct grub_hfsplus_btnode **matchnode,
grub_off_t *keyoffset); grub_off_t *keyoffset);
grub_err_t grub_err_t
grub_mac_bless_inode (grub_device_t dev, grub_uint64_t inode, int is_dir, grub_mac_bless_inode (grub_device_t dev, grub_uint32_t inode, int is_dir,
int intel); int intel);
grub_err_t grub_err_t
grub_mac_bless_file (grub_device_t dev, const char *path_in, int intel); grub_mac_bless_file (grub_device_t dev, const char *path_in, int intel);