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.

diff --git a/ChangeLog b/ChangeLog
index d565547453e74301c250b53f5e46afd8b2f25830..9c6dde54d718c6e8cb4a77ddb76c7a9b75224622 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        Support big-endian UFS1.

diff --git a/grub-core/fs/ufs.c b/grub-core/fs/ufs.c
index 3f2dba1d9249a1f7288695a61d13136acc74862d..c8623367458ba6347185943ad92f0344a9be645f 100644 (file)
--- a/grub-core/fs/ufs.c
+++ b/grub-core/fs/ufs.c
@@ -151,9 +151,9 @@ struct grub_ufs_inode
   grub_uint64_t mtime;
   grub_uint64_t ctime;
   grub_uint64_t create_time;
-  grub_uint32_t atime_sec;
-  grub_uint32_t mtime_sec;
-  grub_uint32_t ctime_sec;
+  grub_uint32_t atime_usec;
+  grub_uint32_t mtime_usec;
+  grub_uint32_t ctime_usec;
   grub_uint32_t create_time_sec;
   grub_uint32_t gen;
   grub_uint32_t kernel_flags;
@@ -181,9 +181,12 @@ struct grub_ufs_inode
   grub_uint16_t uid;
   grub_uint16_t gid;
   grub_uint64_t size;
-  grub_uint64_t atime;
-  grub_uint64_t mtime;
-  grub_uint64_t ctime;
+  grub_uint32_t atime;
+  grub_uint32_t atime_usec;
+  grub_uint32_t mtime;
+  grub_uint32_t mtime_usec;
+  grub_uint32_t ctime;
+  grub_uint32_t ctime_usec;
   union
   {
     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)
                    == GRUB_UFS_ATTR_DIR);
+#ifdef MODE_UFS2
        info.mtime = grub_ufs_to_cpu64 (inode.mtime);
+#else
+       info.mtime = grub_ufs_to_cpu32 (inode.mtime);
+#endif
        info.mtimeset = 1;
 
        if (hook (filename, &info))