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.

diff --git a/ChangeLog b/ChangeLog
index f07e8da7aa2db2debe6b2a6300eb3d81397fd841..701154b72cd0569310fdef8782fec0f1aad2d0d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/kern/file.c b/kern/file.c
index d7d625b3e605779c39d812b846edacd34d6dad46..4ffbe5c2383533a3f207cff273dbcb932a9a6fa2 100644 (file)
--- a/kern/file.c
+++ b/kern/file.c
@@ -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");

diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index de35c10225b46c1955fe954b146c6ea0d8610987..f5beec4a13feec756f001fd97316b12c59a9ee00 100644 (file)
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -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)