2005-10-15 Yoshinori K. Okuji <okuji@enbug.org>
* kern/file.c (grub_file_seek): Seeking to an offset equal to a file size must be permitted. * kern/i386/pc/startup.S (multiboot_trampoline): Fix a mistake between %ah and %al.
This commit is contained in:
parent
5c177389e2
commit
219ad4262c
3 changed files with 11 additions and 3 deletions
|
@ -1,3 +1,11 @@
|
|||
2005-10-15 Yoshinori K. Okuji <okuji@enbug.org>
|
||||
|
||||
* kern/file.c (grub_file_seek): Seeking to an offset equal to a
|
||||
file size must be permitted.
|
||||
|
||||
* kern/i386/pc/startup.S (multiboot_trampoline): Fix a mistake
|
||||
between %ah and %al.
|
||||
|
||||
2005-10-15 Yoshinori K. Okuji <okuji@enbug.org>
|
||||
|
||||
* fs/xfs.c (grub_xfs_iterate_dir): Change the type of BLK to
|
||||
|
|
|
@ -146,7 +146,7 @@ grub_file_seek (grub_file_t file, grub_ssize_t offset)
|
|||
{
|
||||
grub_ssize_t old;
|
||||
|
||||
if (offset < 0 || offset >= file->size)
|
||||
if (offset < 0 || offset > file->size)
|
||||
{
|
||||
grub_error (GRUB_ERR_OUT_OF_RANGE,
|
||||
"attempt to seek outside of the file");
|
||||
|
|
|
@ -149,12 +149,12 @@ multiboot_trampoline:
|
|||
movl %edx, %eax
|
||||
shrl $8, %eax
|
||||
xorl %ebx, %ebx
|
||||
cmpb $0xFF, %al
|
||||
cmpb $0xFF, %ah
|
||||
je 1f
|
||||
movb %ah, %bl
|
||||
movl %ebx, EXT_C(grub_install_dos_part)
|
||||
1:
|
||||
cmpb $0xFF, %ah
|
||||
cmpb $0xFF, %al
|
||||
je 2f
|
||||
movb %al, %bl
|
||||
movl %ebx, EXT_C(grub_install_bsd_part)
|
||||
|
|
Loading…
Reference in a new issue