vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix UFS1 big file support.

Browse source 
* 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.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-10 00:25:36 +02:00
parent 21b82e176e
commit 6d521c5b41
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -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> 2012-05-09 Vladimir Serbinenko <phcoder@gmail.com>
Fix minixfs with non-power-of-two blocks since it's supported by minix. Fix minixfs with non-power-of-two blocks since it's supported by minix.

13
grub-core/fs/ufs.c
View file

@ -53,17 +53,14 @@ GRUB_MOD_LICENSE ("GPLv3+");
#define UFS_BLKSZ(sblock) (grub_le_to_cpu32 (sblock->bsize)) #define UFS_BLKSZ(sblock) (grub_le_to_cpu32 (sblock->bsize))
#define UFS_LOG_BLKSZ(sblock) (data->log2_blksz) #define UFS_LOG_BLKSZ(sblock) (data->log2_blksz)
#define INODE(data,field) data->inode. field
#ifdef MODE_UFS2 #ifdef MODE_UFS2
#define INODE_ENDIAN(data,field,bits1,bits2) grub_le_to_cpu##bits2 (data->inode.field) #define INODE_ENDIAN(data,field,bits1,bits2) grub_le_to_cpu##bits2 (data->inode.field)
#else #else
#define INODE_ENDIAN(data,field,bits1,bits2) grub_le_to_cpu##bits1 (data->inode.field) #define INODE_ENDIAN(data,field,bits1,bits2) grub_le_to_cpu##bits1 (data->inode.field)
#endif #endif
#define INODE_SIZE(data) INODE_ENDIAN (data,size,32,64) #define INODE_SIZE(data) grub_le_to_cpu64 (data->inode.size)
#define INODE_NBLOCKS(data) INODE_ENDIAN (data,nblocks,32,64) #define INODE_MODE(data) grub_le_to_cpu16 (data->inode.mode)
#define INODE_MODE(data) INODE_ENDIAN (data,mode,16,16)
#ifdef MODE_UFS2 #ifdef MODE_UFS2
#define LOG_INODE_BLKSZ 3 #define LOG_INODE_BLKSZ 3
#else #else
@ -136,7 +133,7 @@ struct grub_ufs_inode
grub_uint32_t uid; grub_uint32_t uid;
grub_uint32_t gid; grub_uint32_t gid;
grub_uint32_t blocksize; grub_uint32_t blocksize;
grub_int64_t size; grub_uint64_t size;
grub_int64_t nblocks; grub_int64_t nblocks;
grub_uint64_t atime; grub_uint64_t atime;
grub_uint64_t mtime; grub_uint64_t mtime;
@ -171,7 +168,7 @@ struct grub_ufs_inode
grub_uint16_t nlinks; grub_uint16_t nlinks;
grub_uint16_t uid; grub_uint16_t uid;
grub_uint16_t gid; grub_uint16_t gid;
grub_int64_t size; grub_uint64_t size;
grub_uint64_t atime; grub_uint64_t atime;
grub_uint64_t mtime; grub_uint64_t mtime;
grub_uint64_t ctime; 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. */ /* Check against zero is paylindromic, no need to swap. */
if (data->inode.nblocks == 0 if (data->inode.nblocks == 0
&& INODE_SIZE (data) <= sizeof (data->inode.symlink)) && INODE_SIZE (data) <= sizeof (data->inode.symlink))
grub_strcpy (symlink, (char *) INODE (data, symlink)); grub_strcpy (symlink, (char *) data->inode.symlink);
else else
grub_ufs_read_file (data, 0, 0, INODE_SIZE (data), symlink); grub_ufs_read_file (data, 0, 0, INODE_SIZE (data), symlink);
symlink[INODE_SIZE (data)] = '\0'; symlink[INODE_SIZE (data)] = '\0';