|
 |
a5bd9f6 |
From 32776fea2049a8b8198fdd59d49e18b4f8916d28 Mon Sep 17 00:00:00 2001
|
|
|
a5bd9f6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
Date: Sat, 8 Dec 2012 21:14:08 +0100
|
|
|
a5bd9f6 |
Subject: [PATCH 057/364] Fix big-endian mtime.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
* grub-core/fs/ufs.c (grub_ufs_inode): Split improperly attached
|
|
|
a5bd9f6 |
together sec and usec.
|
|
|
a5bd9f6 |
(grub_ufs_dir): Use correct byteswapping for UFS time.
|
|
|
a5bd9f6 |
---
|
|
|
a5bd9f6 |
ChangeLog | 8 ++++++++
|
|
|
a5bd9f6 |
grub-core/fs/ufs.c | 19 +++++++++++++------
|
|
|
a5bd9f6 |
2 files changed, 21 insertions(+), 6 deletions(-)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
a5bd9f6 |
index d565547..9c6dde5 100644
|
|
|
a5bd9f6 |
--- a/ChangeLog
|
|
|
a5bd9f6 |
+++ b/ChangeLog
|
|
|
a5bd9f6 |
@@ -1,5 +1,13 @@
|
|
|
a5bd9f6 |
2012-12-08 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
+ Fix big-endian mtime.
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
+ * grub-core/fs/ufs.c (grub_ufs_inode): Split improperly attached
|
|
|
a5bd9f6 |
+ together sec and usec.
|
|
|
a5bd9f6 |
+ (grub_ufs_dir): Use correct byteswapping for UFS time.
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
+2012-12-08 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
Support big-endian UFS1.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
* Makefile.util.def (libgrubmods): Add ufs_be.c
|
|
|
a5bd9f6 |
diff --git a/grub-core/fs/ufs.c b/grub-core/fs/ufs.c
|
|
|
a5bd9f6 |
index 3f2dba1..c862336 100644
|
|
|
a5bd9f6 |
--- a/grub-core/fs/ufs.c
|
|
|
a5bd9f6 |
+++ b/grub-core/fs/ufs.c
|
|
|
a5bd9f6 |
@@ -151,9 +151,9 @@ struct grub_ufs_inode
|
|
|
a5bd9f6 |
grub_uint64_t mtime;
|
|
|
a5bd9f6 |
grub_uint64_t ctime;
|
|
|
a5bd9f6 |
grub_uint64_t create_time;
|
|
|
a5bd9f6 |
- grub_uint32_t atime_sec;
|
|
|
a5bd9f6 |
- grub_uint32_t mtime_sec;
|
|
|
a5bd9f6 |
- grub_uint32_t ctime_sec;
|
|
|
a5bd9f6 |
+ grub_uint32_t atime_usec;
|
|
|
a5bd9f6 |
+ grub_uint32_t mtime_usec;
|
|
|
a5bd9f6 |
+ grub_uint32_t ctime_usec;
|
|
|
a5bd9f6 |
grub_uint32_t create_time_sec;
|
|
|
a5bd9f6 |
grub_uint32_t gen;
|
|
|
a5bd9f6 |
grub_uint32_t kernel_flags;
|
|
|
a5bd9f6 |
@@ -181,9 +181,12 @@ struct grub_ufs_inode
|
|
|
a5bd9f6 |
grub_uint16_t uid;
|
|
|
a5bd9f6 |
grub_uint16_t gid;
|
|
|
a5bd9f6 |
grub_uint64_t size;
|
|
|
a5bd9f6 |
- grub_uint64_t atime;
|
|
|
a5bd9f6 |
- grub_uint64_t mtime;
|
|
|
a5bd9f6 |
- grub_uint64_t ctime;
|
|
|
a5bd9f6 |
+ grub_uint32_t atime;
|
|
|
a5bd9f6 |
+ grub_uint32_t atime_usec;
|
|
|
a5bd9f6 |
+ grub_uint32_t mtime;
|
|
|
a5bd9f6 |
+ grub_uint32_t mtime_usec;
|
|
|
a5bd9f6 |
+ grub_uint32_t ctime;
|
|
|
a5bd9f6 |
+ grub_uint32_t ctime_usec;
|
|
|
a5bd9f6 |
union
|
|
|
a5bd9f6 |
{
|
|
|
a5bd9f6 |
struct
|
|
|
a5bd9f6 |
@@ -684,7 +687,11 @@ grub_ufs_dir (grub_device_t device, const char *path,
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
info.dir = ((grub_ufs_to_cpu16 (inode.mode) & GRUB_UFS_ATTR_TYPE)
|
|
|
a5bd9f6 |
== GRUB_UFS_ATTR_DIR);
|
|
|
a5bd9f6 |
+#ifdef MODE_UFS2
|
|
|
a5bd9f6 |
info.mtime = grub_ufs_to_cpu64 (inode.mtime);
|
|
|
a5bd9f6 |
+#else
|
|
|
a5bd9f6 |
+ info.mtime = grub_ufs_to_cpu32 (inode.mtime);
|
|
|
a5bd9f6 |
+#endif
|
|
|
a5bd9f6 |
info.mtimeset = 1;
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
if (hook (filename, &info))
|
|
|
a5bd9f6 |
--
|
|
|
a5bd9f6 |
1.8.1.4
|
|
|
a5bd9f6 |
|