[2587] 2009-09-11 Colin Watson <[email protected]>

Revision: 2587
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2587
Author:   cjwatson
Date:     2009-09-11 14:26:12 +0000 (Fri, 11 Sep 2009)
Log Message:
-----------
2009-09-11  Colin Watson  <[email protected]>

	* 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.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/fs/ntfs.c
    trunk/grub2/include/grub/ntfs.h

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-09-11 14:17:35 UTC (rev 2586)
+++ trunk/grub2/ChangeLog	2009-09-11 14:26:12 UTC (rev 2587)
@@ -1,5 +1,12 @@
 2009-09-11  Colin Watson  <[email protected]>
 
+	* 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  <[email protected]>
+
 	* configure.ac: Don't look for help2man when cross-compiling.  Fixes
 	part of bug #27349.
 

Modified: trunk/grub2/fs/ntfs.c
===================================================================
--- trunk/grub2/fs/ntfs.c	2009-09-11 14:17:35 UTC (rev 2586)
+++ trunk/grub2/fs/ntfs.c	2009-09-11 14:26:12 UTC (rev 2587)
@@ -543,7 +543,7 @@
       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 */

Modified: trunk/grub2/include/grub/ntfs.h
===================================================================
--- trunk/grub2/include/grub/ntfs.h	2009-09-11 14:17:35 UTC (rev 2586)
+++ trunk/grub2/include/grub/ntfs.h	2009-09-11 14:26:12 UTC (rev 2587)
@@ -133,7 +133,7 @@
 {
   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;