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

Fix wrapped HFS+ handling.

Browse source 
* grub-core/fs/fshelp.c (grub_fshelp_read_file): New argument
	blocks_start. All users updated.
	* grub-core/fs/hfsplus.c (grub_hfsplus_read_block): Don't add
	wrapping offset.
	(grub_hfsplus_read_file): Pass embedding offset to fshelp_read_file.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-09 13:02:59 +02:00
parent 607d282b29
commit f417ed0432
11 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
grub-core/fs/fshelp.c
View file

@ -233,7 +233,8 @@ grub_fshelp_read_file (grub_disk_t disk, grub_fshelp_node_t node,
grub_off_t pos, grub_size_t len, char *buf,
grub_disk_addr_t (*get_block) (grub_fshelp_node_t node,
grub_disk_addr_t block),
grub_off_t filesize, int log2blocksize)
grub_off_t filesize, int log2blocksize,
grub_disk_addr_t blocks_start)
{
grub_disk_addr_t i, blockcnt;
int blocksize = 1 << (log2blocksize + GRUB_DISK_SECTOR_BITS);
@ -281,7 +282,7 @@ grub_fshelp_read_file (grub_disk_t disk, grub_fshelp_node_t node,
{
disk->read_hook = read_hook;
grub_disk_read (disk, blknr, skipfirst,
grub_disk_read (disk, blknr + blocks_start, skipfirst,
blockend, buf);
disk->read_hook = 0;
if (grub_errno)