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

Fix big-endian mtime.

Browse source 
* grub-core/fs/ufs.c (grub_ufs_inode): Split improperly attached
	together sec and usec.
	(grub_ufs_dir): Use correct byteswapping for UFS time.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-12-08 21:14:08 +01:00
parent d9c48c7b7c
commit e77a16ca02
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2012-12-08 Vladimir Serbinenko <phcoder@gmail.com>
Fix big-endian mtime.
* grub-core/fs/ufs.c (grub_ufs_inode): Split improperly attached
together sec and usec.
(grub_ufs_dir): Use correct byteswapping for UFS time.
2012-12-08 Vladimir Serbinenko <phcoder@gmail.com> 2012-12-08 Vladimir Serbinenko <phcoder@gmail.com>
Support big-endian UFS1. Support big-endian UFS1.

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

@ -151,9 +151,9 @@ struct grub_ufs_inode
grub_uint64_t mtime; grub_uint64_t mtime;
grub_uint64_t ctime; grub_uint64_t ctime;
grub_uint64_t create_time; grub_uint64_t create_time;
grub_uint32_t atime_sec; grub_uint32_t atime_usec;
grub_uint32_t mtime_sec; grub_uint32_t mtime_usec;
grub_uint32_t ctime_sec; grub_uint32_t ctime_usec;
grub_uint32_t create_time_sec; grub_uint32_t create_time_sec;
grub_uint32_t gen; grub_uint32_t gen;
grub_uint32_t kernel_flags; grub_uint32_t kernel_flags;
@ -181,9 +181,12 @@ struct grub_ufs_inode
grub_uint16_t uid; grub_uint16_t uid;
grub_uint16_t gid; grub_uint16_t gid;
grub_uint64_t size; grub_uint64_t size;
grub_uint64_t atime; grub_uint32_t atime;
grub_uint64_t mtime; grub_uint32_t atime_usec;
grub_uint64_t ctime; grub_uint32_t mtime;
grub_uint32_t mtime_usec;
grub_uint32_t ctime;
grub_uint32_t ctime_usec;
union union
{ {
struct struct
@ -684,7 +687,11 @@ grub_ufs_dir (grub_device_t device, const char *path,
info.dir = ((grub_ufs_to_cpu16 (inode.mode) & GRUB_UFS_ATTR_TYPE) info.dir = ((grub_ufs_to_cpu16 (inode.mode) & GRUB_UFS_ATTR_TYPE)
== GRUB_UFS_ATTR_DIR); == GRUB_UFS_ATTR_DIR);
#ifdef MODE_UFS2
info.mtime = grub_ufs_to_cpu64 (inode.mtime); info.mtime = grub_ufs_to_cpu64 (inode.mtime);
#else
info.mtime = grub_ufs_to_cpu32 (inode.mtime);
#endif
info.mtimeset = 1; info.mtimeset = 1;
if (hook (filename, &info)) if (hook (filename, &info))