Fix UFS1 big file support.

	* grub-core/fs/ufs.c (INODE): Removed.
	(INODE_SIZE): Always use 64-bit byte-swap since size field is always
	64-bit.
	(INODE_MODE): Simplify.
	(grub_ufs_inode): Use uint64_t for size and not int64_t.
	(grub_ufs_lookup_symlink): Don't use INODE.

diff --git a/ChangeLog b/ChangeLog
index 3df8588c4d2261c96e1e9f688011167ae805802f..581f58ef9c5e461aa33edafa716a41b13904ccb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-05-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Fix UFS1 big file support.
+
+       * grub-core/fs/ufs.c (INODE): Removed.
+       (INODE_SIZE): Always use 64-bit byte-swap since size field is always
+       64-bit.
+       (INODE_MODE): Simplify.
+       (grub_ufs_inode): Use uint64_t for size and not int64_t.
+       (grub_ufs_lookup_symlink): Don't use INODE.
+
 2012-05-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Fix minixfs with non-power-of-two blocks since it's supported by minix.

diff --git a/grub-core/fs/ufs.c b/grub-core/fs/ufs.c
index 49173f9fe97ccd89c94c8fe041598f62f1f096b4..05a0d2d4213d436c0342d392067c132474766225 100644 (file)
--- a/grub-core/fs/ufs.c
+++ b/grub-core/fs/ufs.c
@@ -53,17 +53,14 @@ GRUB_MOD_LICENSE ("GPLv3+");
 #define UFS_BLKSZ(sblock) (grub_le_to_cpu32 (sblock->bsize))
 #define UFS_LOG_BLKSZ(sblock) (data->log2_blksz)
 
-#define INODE(data,field) data->inode.  field
 #ifdef MODE_UFS2
 #define INODE_ENDIAN(data,field,bits1,bits2) grub_le_to_cpu##bits2 (data->inode.field)
 #else
 #define INODE_ENDIAN(data,field,bits1,bits2) grub_le_to_cpu##bits1 (data->inode.field)
 #endif
 
-#define INODE_SIZE(data) INODE_ENDIAN (data,size,32,64)
-#define INODE_NBLOCKS(data) INODE_ENDIAN (data,nblocks,32,64)
-
-#define INODE_MODE(data) INODE_ENDIAN (data,mode,16,16)
+#define INODE_SIZE(data) grub_le_to_cpu64 (data->inode.size)
+#define INODE_MODE(data) grub_le_to_cpu16 (data->inode.mode)
 #ifdef MODE_UFS2
 #define LOG_INODE_BLKSZ 3
 #else
@@ -136,7 +133,7 @@ struct grub_ufs_inode
   grub_uint32_t uid;
   grub_uint32_t gid;
   grub_uint32_t blocksize;
-  grub_int64_t size;
+  grub_uint64_t size;
   grub_int64_t nblocks;
   grub_uint64_t atime;
   grub_uint64_t mtime;
@@ -171,7 +168,7 @@ struct grub_ufs_inode
   grub_uint16_t nlinks;
   grub_uint16_t uid;
   grub_uint16_t gid;
-  grub_int64_t size;
+  grub_uint64_t size;
   grub_uint64_t atime;
   grub_uint64_t mtime;
   grub_uint64_t ctime;
@@ -441,7 +438,7 @@ grub_ufs_lookup_symlink (struct grub_ufs_data *data, int ino)
   /* Check against zero is paylindromic, no need to swap.  */
   if (data->inode.nblocks == 0
       && INODE_SIZE (data) <= sizeof (data->inode.symlink))
-    grub_strcpy (symlink, (char *) INODE (data, symlink));
+    grub_strcpy (symlink, (char *) data->inode.symlink);
   else
     grub_ufs_read_file (data, 0, 0, INODE_SIZE (data), symlink);
   symlink[INODE_SIZE (data)] = '\0';