2009-09-11 Colin Watson <cjwatson@ubuntu.com>

	* include/grub/ntfs.h (struct grub_fshelp_node): Change `size'
	to grub_uint64_t.
	* fs/ntfs.c (init_file): Understand 64-bit sizes for
	non-resident files.

diff --git a/ChangeLog b/ChangeLog
index 4aa111936fbd26a59a694db72ca7154d05b323da..64b77d04d9b512399a66528d2f34a151641f10a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-11  Colin Watson  <cjwatson@ubuntu.com>
+
+       * include/grub/ntfs.h (struct grub_fshelp_node): Change `size'
+       to grub_uint64_t.
+       * fs/ntfs.c (init_file): Understand 64-bit sizes for
+       non-resident files.
+
 2009-09-11  Colin Watson  <cjwatson@ubuntu.com>
 
        * configure.ac: Don't look for help2man when cross-compiling.  Fixes

diff --git a/fs/ntfs.c b/fs/ntfs.c
index 3ff487c6e8460a54b3384dec34d76ef05846bc47..f1d0a374ef04e7f1177aa2717ae370c829e4de6a 100644 (file)
--- a/fs/ntfs.c
+++ b/fs/ntfs.c
@@ -543,7 +543,7 @@ init_file (struct grub_ntfs_file *mft, grub_uint32_t mftno)
       if (!pa[8])
        mft->size = u32at (pa, 0x10);
       else
-       mft->size = u32at (pa, 0x30);
+       mft->size = u64at (pa, 0x30);
 
       if ((mft->attr.flags & AF_ALST) == 0)
        mft->attr.attr_end = 0; /*  Don't jump to attribute list */

diff --git a/include/grub/ntfs.h b/include/grub/ntfs.h
index 9b2ae0a0cdaaea2eabee394500250cab8ccbeec8..6482e964be3a317f034eea640451b2c5be6a9fa2 100644 (file)
--- a/include/grub/ntfs.h
+++ b/include/grub/ntfs.h
@@ -133,7 +133,7 @@ struct grub_fshelp_node
 {
   struct grub_ntfs_data *data;
   char *buf;
-  grub_uint32_t size;
+  grub_uint64_t size;
   grub_uint32_t ino;
   int inode_read;
   struct grub_ntfs_attr attr;