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

2009-04-05 Vladimir Serbinenko <phcoder@gmail.com>

Browse source 
Support for mtime and further expandability of dir command

	* include/grub/lib/datetime.h: moved to ...
	* include/grub/datetime.h: ... moved here and added 
	declaration of grub_unixtime2datetime. All users updated
	* include/grub/fs.h: new syntax for dir and mtime functionin 
	struct grub_fs 
	* include/grub/fshelp.h: new declarations of GRUB_FSHELP_TYPE_MASK
	and GRUB_FSHELP_FLAGS_MASK
	* commands/ls.c (grub_ls_list_files): Write mtime in long format
	* fs/ext2.c (grub_ext2_dir): use new dir syntax and supply mtime
	(grub_ext2_mtime): new function
	* fs/hfsplus.c (grub_hfsplus_dir): use new dir syntax and supply mtime
	(grub_hfsplus_mtime): new function
	* fs/ufs.c (GRUB_UFS_ATTR_TYPE): new definition
	(GRUB_UFS_ATTR_FILE): likewise
	(GRUB_UFS_ATTR_LNK): likewise
	(struct grub_ufs_sblock): new fields mtime
	(grub_ufs_read_inode): new parameter to read inode to a separate buffer
	all users updated
	(grub_ufs_dir): mtime support
	(grub_ufs_mtime): new function
	* fs/affs.c (grub_affs_dir): use new dir syntax
	* fs/afs.c (grub_afs_dir): likewise
	* fs/cpio.c (grub_cpio_dir): likewise
	* fs/fat.c (grub_fat_find_dir): likewise
	* fs/hfs.c (grub_hfs_dir): likewise
	* fs/iso9660.c (grub_iso9660_dir): likewise
	* fs/jfs.c (grub_jfs_dir): likewise
	* fs/minix.c (grub_minix_dir): likewise
	* fs/ntfs.c (grub_ntfs_dir): likewise
	* fs/reiserfs.c (grub_reiserfs_dir): likewise
	* fs/sfs.c (grub_sfs_dir): likewise
	* fs/xfs.c (grub_xfs_dir): likewise
	* util/hostfs.c (grub_hostfs_dir): likewise
	* lib/datetime.c: moved to ...
	* normal/datetime.c: ... moved here
	(grub_unixtime2datetime): new function
	* kern/rescue.c (grub_rescue_print_files): use new dir syntax
	* normal/completition.c (iterate_dir): use new dir syntax
	* normal/misc.c (grub_normal_print_device_info): tell the 
	last modification time of a volume
	* kern/fs.c (grub_fs_probe): updated dummy function to use new syntax 
	* conf/common.rmk: added lib/datetime.c to ls.mod
	* conf/i386-coreboot.rmk (grub_emu_SOURCES): add normal/datetime.c  
	(normal_mod_SOURCES): likewise
	(datetime_mod_SOURCES): Removed lib/datetime.c
	* conf/i386-efi.rmk: likewise
	* conf/i386-ieee1275.rmk: likewise	
	* conf/i386-pc.rmk: likewise
	* conf/powerpc-ieee1275.rmk: likewise
	* conf/sparc64-ieee1275.rmk: likewise	
	* conf/x86_64-efi.rmk: likewise
This commit is contained in:
phcoder 2009-04-05 20:19:05 +00:00
parent 8a7e1a145f
commit 05aaebfb7b
48 changed files with 834 additions and 443 deletions
Download patch file Download diff file Expand all files Collapse all files

14
fs/affs.c
View file

@ -456,7 +456,8 @@ grub_affs_read (grub_file_t file, char *buf, grub_size_t len)
static grub_err_t
grub_affs_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
struct grub_affs_data *data = 0;
struct grub_fshelp_node *fdiro = 0;
@ -469,14 +470,11 @@ grub_affs_dir (grub_device_t device, const char *path,
enum grub_fshelp_filetype filetype,
grub_fshelp_node_t node)
{
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR);
grub_free (node);
if (filetype == GRUB_FSHELP_DIR)
return hook (filename, 1);
else
return hook (filename, 0);
return 0;
return hook (filename, &info);
}
#ifndef GRUB_UTIL

14
fs/afs.c
View file

@ -562,7 +562,8 @@ grub_afs_close (grub_file_t file)
static grub_err_t
grub_afs_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
struct grub_afs_data *data = 0;;
struct grub_fshelp_node *fdiro = 0;
@ -575,14 +576,11 @@ grub_afs_dir (grub_device_t device, const char *path,
enum grub_fshelp_filetype filetype,
grub_fshelp_node_t node)
{
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR);
grub_free (node);
if (filetype == GRUB_FSHELP_DIR)
return hook (filename, 1);
else
return hook (filename, 0);
return 0;
return hook (filename, &info);
}
#ifndef GRUB_UTIL

9
fs/cpio.c
View file

@ -183,7 +183,8 @@ fail:
static grub_err_t
grub_cpio_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
struct grub_cpio_data *data;
grub_uint32_t ofs;
@ -227,7 +228,11 @@ grub_cpio_dir (grub_device_t device, const char *path,
if ((!prev) || (grub_strcmp (prev, name) != 0))
{
hook (name + len, p != NULL);
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
info.dir = (p != NULL);
hook (name + len, &info);
if (prev)
grub_free (prev);
prev = name;

56
fs/ext2.c
View file

@ -791,7 +791,8 @@ grub_ext2_read (grub_file_t file, char *buf, grub_size_t len)
static grub_err_t
grub_ext2_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
struct grub_ext2_data *data = 0;;
struct grub_fshelp_node *fdiro = 0;
@ -804,14 +805,24 @@ grub_ext2_dir (grub_device_t device, const char *path,
enum grub_fshelp_filetype filetype,
grub_fshelp_node_t node)
{
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
if (! node->inode_read)
{
grub_ext2_read_inode (data, node->ino, &node->inode);
if (!grub_errno)
node->inode_read = 1;
grub_errno = GRUB_ERR_NONE;
}
if (node->inode_read)
{
info.mtimeset = 1;
info.mtime = grub_le_to_cpu32 (node->inode.mtime);
}
info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR);
grub_free (node);
if (filetype == GRUB_FSHELP_DIR)
return hook (filename, 1);
else
return hook (filename, 0);
return 0;
return hook (filename, &info);
}
#ifndef GRUB_UTIL
@ -898,6 +909,34 @@ grub_ext2_uuid (grub_device_t device, char **uuid)
return grub_errno;
}
/* Get mtime. */
static grub_err_t
grub_ext2_mtime (grub_device_t device, grub_int32_t *tm)
{
struct grub_ext2_data *data;
grub_disk_t disk = device->disk;
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
data = grub_ext2_mount (disk);
if (!data)
*tm = 0;
else
*tm = grub_le_to_cpu32 (data->sblock.utime);
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
grub_free (data);
return grub_errno;
}
static struct grub_fs grub_ext2_fs =
{
@ -908,6 +947,7 @@ static struct grub_fs grub_ext2_fs =
.close = grub_ext2_close,
.label = grub_ext2_label,
.uuid = grub_ext2_uuid,
.mtime = grub_ext2_mtime,
.next = 0
};

16
fs/fat.c
View file

@ -606,7 +606,8 @@ grub_fat_iterate_dir (grub_disk_t disk, struct grub_fat_data *data,
static char *
grub_fat_find_dir (grub_disk_t disk, struct grub_fat_data *data,
const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
char *dirname, *dirp;
int call_hook;
@ -615,10 +616,16 @@ grub_fat_find_dir (grub_disk_t disk, struct grub_fat_data *data,
auto int iter_hook (const char *filename, struct grub_fat_dir_entry *dir);
int iter_hook (const char *filename, struct grub_fat_dir_entry *dir)
{
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
info.dir = !! (dir->attr & GRUB_FAT_ATTR_DIRECTORY);
info.case_insensitive = 1;
if (dir->attr & GRUB_FAT_ATTR_VOLUME_ID)
return 0;
if (*dirname == '\0' && call_hook)
return hook (filename, dir->attr & GRUB_FAT_ATTR_DIRECTORY);
return hook (filename, &info);
if (grub_strcasecmp (dirname, filename) == 0)
{
@ -630,7 +637,7 @@ grub_fat_find_dir (grub_disk_t disk, struct grub_fat_data *data,
data->cur_cluster_num = ~0U;
if (call_hook)
hook (filename, dir->attr & GRUB_FAT_ATTR_DIRECTORY);
hook (filename, &info);
return 1;
}
@ -676,7 +683,8 @@ grub_fat_find_dir (grub_disk_t disk, struct grub_fat_data *data,
static grub_err_t
grub_fat_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
struct grub_fat_data *data = 0;
grub_disk_t disk = device->disk;

15
fs/hfs.c
View file

@ -943,7 +943,8 @@ grub_hfs_find_dir (struct grub_hfs_data *data, const char *path,
static grub_err_t
grub_hfs_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
int inode;
@ -954,13 +955,17 @@ grub_hfs_dir (grub_device_t device, const char *path,
char fname[32] = { 0 };
char *filetype = rec->data;
struct grub_hfs_catalog_key *ckey = rec->key;
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
grub_strncpy (fname, (char *) (ckey->str), ckey->strlen);
if (*filetype == GRUB_HFS_FILETYPE_DIR)
return hook (fname, 1);
else if (*filetype == GRUB_HFS_FILETYPE_FILE)
return hook (fname, 0);
if (*filetype == GRUB_HFS_FILETYPE_DIR
|| *filetype == GRUB_HFS_FILETYPE_FILE)
{
info.dir = (*filetype == GRUB_HFS_FILETYPE_DIR);
return hook (fname, &info);
}
return 0;
}

60
fs/hfsplus.c
View file

@ -57,9 +57,11 @@ struct grub_hfsplus_volheader
grub_uint16_t magic;
grub_uint16_t version;
grub_uint32_t attributes;
grub_uint8_t unused[32];
grub_uint8_t unused1[12];
grub_uint32_t utime;
grub_uint8_t unused2[16];
grub_uint32_t blksize;
grub_uint8_t unused2[68];
grub_uint8_t unused3[68];
struct grub_hfsplus_forkdata allocations_file;
struct grub_hfsplus_forkdata extents_file;
struct grub_hfsplus_forkdata catalog_file;
@ -133,9 +135,11 @@ struct grub_hfsplus_catfile
grub_uint16_t flags;
grub_uint32_t reserved;
grub_uint32_t fileid;
grub_uint8_t unused1[30];
grub_uint8_t unused1[4];
grub_uint32_t mtime;
grub_uint8_t unused2[22];
grub_uint16_t mode;
grub_uint8_t unused2[44];
grub_uint8_t unused3[44];
struct grub_hfsplus_forkdata data;
struct grub_hfsplus_forkdata resource;
} __attribute__ ((packed));
@ -190,6 +194,7 @@ struct grub_fshelp_node
struct grub_hfsplus_extent extents[8];
grub_uint64_t size;
grub_uint32_t fileid;
grub_int32_t mtime;
};
struct grub_hfsplus_btree
@ -780,6 +785,7 @@ grub_hfsplus_iterate_dir (grub_fshelp_node_t dir,
grub_memcpy (node->extents, fileinfo->data.extents,
sizeof (node->extents));
node->mtime = grub_be_to_cpu32 (fileinfo->mtime) - 2082844800;
node->size = grub_be_to_cpu64 (fileinfo->data.size);
node->fileid = grub_be_to_cpu32 (fileinfo->fileid);
@ -885,7 +891,8 @@ grub_hfsplus_read (grub_file_t file, char *buf, grub_size_t len)
static grub_err_t
grub_hfsplus_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
struct grub_hfsplus_data *data = 0;
struct grub_fshelp_node *fdiro = 0;
@ -898,14 +905,14 @@ grub_hfsplus_dir (grub_device_t device, const char *path,
enum grub_fshelp_filetype filetype,
grub_fshelp_node_t node)
{
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR);
info.mtimeset = 1;
info.mtime = node->mtime;
info.case_insensitive = !! (filetype & GRUB_FSHELP_CASE_INSENSITIVE);
grub_free (node);
if (filetype == GRUB_FSHELP_DIR)
return hook (filename, 1);
else
return hook (filename, 0);
return 0;
return hook (filename, &info);
}
#ifndef GRUB_UTIL
@ -949,6 +956,34 @@ grub_hfsplus_label (grub_device_t device __attribute__((unused))
"partition is not implemented");
}
/* Get mtime. */
static grub_err_t
grub_hfsplus_mtime (grub_device_t device, grub_int32_t *tm)
{
struct grub_hfsplus_data *data;
grub_disk_t disk = device->disk;
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
data = grub_hfsplus_mount (disk);
if (!data)
*tm = 0;
else
*tm = grub_be_to_cpu32 (data->volheader.utime) - 2082844800;
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
grub_free (data);
return grub_errno;
}
static struct grub_fs grub_hfsplus_fs =
{
@ -958,6 +993,7 @@ static struct grub_fs grub_hfsplus_fs =
.read = grub_hfsplus_read,
.close = grub_hfsplus_close,
.label = grub_hfsplus_label,
.mtime = grub_hfsplus_mtime,
.next = 0
};

14
fs/iso9660.c
View file

@ -666,7 +666,8 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
static grub_err_t
grub_iso9660_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
struct grub_iso9660_data *data = 0;
struct grub_fshelp_node rootnode;
@ -680,14 +681,11 @@ grub_iso9660_dir (grub_device_t device, const char *path,
enum grub_fshelp_filetype filetype,
grub_fshelp_node_t node)
{
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR);
grub_free (node);
if (filetype == GRUB_FSHELP_DIR)
return hook (filename, 1);
else
return hook (filename, 0);
return 0;
return hook (filename, &info);
}
#ifndef GRUB_UTIL

12
fs/jfs.c
View file

@ -728,7 +728,8 @@ grub_jfs_lookup_symlink (struct grub_jfs_data *data, int ino)
static grub_err_t
grub_jfs_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
struct grub_jfs_data *data = 0;
struct grub_jfs_diropen *diro = 0;
@ -752,14 +753,15 @@ grub_jfs_dir (grub_device_t device, const char *path,
while (grub_jfs_getent (diro) != GRUB_ERR_OUT_OF_RANGE)
{
struct grub_jfs_inode inode;
int isdir;
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
if (grub_jfs_read_inode (data, diro->ino, &inode))
goto fail;
isdir = (grub_le_to_cpu32 (inode.mode)
& GRUB_JFS_FILETYPE_MASK) == GRUB_JFS_FILETYPE_DIR;
if (hook (diro->name, isdir))
info.dir = (grub_le_to_cpu32 (inode.mode)
& GRUB_JFS_FILETYPE_MASK) == GRUB_JFS_FILETYPE_DIR;
if (hook (diro->name, &info))
goto fail;
}

11
fs/minix.c
View file

@ -461,7 +461,8 @@ grub_minix_mount (grub_disk_t disk)
static grub_err_t
grub_minix_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
struct grub_minix_data *data = 0;
struct grub_minix_sblock *sblock;
@ -492,6 +493,9 @@ grub_minix_dir (grub_device_t device, const char *path,
grub_uint16_t ino;
char filename[data->filename_size + 1];
int dirino = data->ino;
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
if (grub_minix_read_file (data, 0, pos, sizeof (ino),
(char *) &ino) < 0)
@ -506,8 +510,9 @@ grub_minix_dir (grub_device_t device, const char *path,
/* The filetype is not stored in the dirent. Read the inode to
find out the filetype. This *REALLY* sucks. */
grub_minix_read_inode (data, grub_le_to_cpu16 (ino));
if (hook (filename, ((GRUB_MINIX_INODE_MODE (data)
& GRUB_MINIX_IFDIR) == GRUB_MINIX_IFDIR)) ? 1 : 0)
info.dir = ((GRUB_MINIX_INODE_MODE (data)
& GRUB_MINIX_IFDIR) == GRUB_MINIX_IFDIR);
if (hook (filename, &info) ? 1 : 0)
break;
/* Load the old inode back in. */

16
fs/ntfs.c
View file

@ -864,7 +864,8 @@ fail:
static grub_err_t
grub_ntfs_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
struct grub_ntfs_data *data = 0;
struct grub_fshelp_node *fdiro = 0;
@ -877,14 +878,11 @@ grub_ntfs_dir (grub_device_t device, const char *path,
enum grub_fshelp_filetype filetype,
grub_fshelp_node_t node)
{
grub_free (node);
if (filetype == GRUB_FSHELP_DIR)
return hook (filename, 1);
else
return hook (filename, 0);
return 0;
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR);
grub_free (node);
return hook (filename, &info);
}
#ifndef GRUB_UTIL

12
fs/reiserfs.c
View file

@ -1266,7 +1266,8 @@ grub_reiserfs_close (grub_file_t file)
/* Call HOOK with each file under DIR. */
static grub_err_t
grub_reiserfs_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
struct grub_reiserfs_data *data = 0;
struct grub_fshelp_node root, *found;
@ -1280,12 +1281,11 @@ grub_reiserfs_dir (grub_device_t device, const char *path,
enum grub_fshelp_filetype filetype,
grub_fshelp_node_t node)
{
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR);
grub_free (node);
if (filetype == GRUB_FSHELP_DIR)
return hook (filename, 1);
else
return hook (filename, 0);
return hook (filename, &info);
}
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);

14
fs/sfs.c
View file

@ -519,7 +519,8 @@ grub_sfs_read (grub_file_t file, char *buf, grub_size_t len)
static grub_err_t
grub_sfs_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
struct grub_sfs_data *data = 0;
struct grub_fshelp_node *fdiro = 0;
@ -532,14 +533,11 @@ grub_sfs_dir (grub_device_t device, const char *path,
enum grub_fshelp_filetype filetype,
grub_fshelp_node_t node)
{
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR);
grub_free (node);
if (filetype == GRUB_FSHELP_DIR)
return hook (filename, 1);
else
return hook (filename, 0);
return 0;
return hook (filename, &info);
}
#ifndef GRUB_UTIL

16
fs/udf.c
View file

@ -768,7 +768,8 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir,
static grub_err_t
grub_udf_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
struct grub_udf_data *data = 0;
struct grub_fshelp_node rootnode;
@ -782,14 +783,11 @@ grub_udf_dir (grub_device_t device, const char *path,
enum grub_fshelp_filetype filetype,
grub_fshelp_node_t node)
{
grub_free (node);
if (filetype == GRUB_FSHELP_DIR)
return hook (filename, 1);
else
return hook (filename, 0);
return 0;
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR);
grub_free (node);
return hook (filename, &info);
}
#ifndef GRUB_UTIL

116
fs/ufs.c
View file

@ -36,7 +36,10 @@
#define GRUB_UFS_DIRBLKS 12
#define GRUB_UFS_INDIRBLKS 3
#define GRUB_UFS_ATTR_DIR 040000
#define GRUB_UFS_ATTR_TYPE 0160000
#define GRUB_UFS_ATTR_FILE 0100000
#define GRUB_UFS_ATTR_DIR 0040000
#define GRUB_UFS_ATTR_LNK 0120000
#define GRUB_UFS_VOLNAME_LEN 32
@ -71,16 +74,18 @@ struct grub_ufs_sblock
/* The start of the cylinder group. */
grub_uint32_t cylg_offset;
grub_uint8_t unused3[20];
grub_uint8_t unused3[4];
grub_uint32_t mtime;
grub_uint8_t unused4[12];
/* The size of a block in bytes. */
grub_int32_t bsize;
grub_uint8_t unused4[48];
grub_uint8_t unused5[48];
/* The size of filesystem blocks to disk blocks. */
grub_uint32_t log2_blksz;
grub_uint8_t unused5[80];
grub_uint8_t unused6[80];
/* Inodes stored per cylinder group. */
grub_uint32_t ino_per_group;
@ -92,8 +97,10 @@ struct grub_ufs_sblock
/* Volume name for UFS2. */
grub_uint8_t volume_name[GRUB_UFS_VOLNAME_LEN];
grub_uint8_t unused8[232];
grub_uint8_t unused8[660];
grub_uint64_t mtime2;
grub_uint8_t unused9[420];
/* Magic value to check if this is really a UFS filesystem. */
grub_uint32_t magic;
@ -124,7 +131,7 @@ struct grub_ufs_inode
grub_uint32_t gen;
grub_uint32_t unused;
grub_uint8_t pad[12];
};
} __attribute__ ((packed));
/* UFS inode. */
struct grub_ufs2_inode
@ -160,7 +167,7 @@ struct grub_ufs2_inode
};
grub_uint8_t unused[24];
};
} __attribute__ ((packed));
/* Directory entry. */
struct grub_ufs_dirent
@ -169,7 +176,7 @@ struct grub_ufs_dirent
grub_uint16_t direntlen;
grub_uint8_t filetype;
grub_uint8_t namelen;
};
} __attribute__ ((packed));
/* Information about a "mounted" ufs filesystem. */
struct grub_ufs_data
@ -320,7 +327,7 @@ grub_ufs_read_file (struct grub_ufs_data *data,
/* Read inode INO from the mounted filesystem described by DATA. This
inode is used by default now. */
static grub_err_t
grub_ufs_read_inode (struct grub_ufs_data *data, int ino)
grub_ufs_read_inode (struct grub_ufs_data *data, int ino, char *inode)
{
struct grub_ufs_sblock *sblock = &data->sblock;
@ -335,8 +342,12 @@ grub_ufs_read_inode (struct grub_ufs_data *data, int ino)
if (data->ufs_type == UFS1)
{
struct grub_ufs_inode *inode = &data->inode;
if (!inode)
{
inode = (char *) &data->inode;
data->ino = ino;
}
grub_disk_read (data->disk,
(((grub_le_to_cpu32 (sblock->inoblk_offs) + grpblk)
<< grub_le_to_cpu32 (data->sblock.log2_blksz)))
@ -347,8 +358,12 @@ grub_ufs_read_inode (struct grub_ufs_data *data, int ino)
}
else
{
struct grub_ufs2_inode *inode = &data->inode2;
if (!inode)
{
inode = (char *) &data->inode2;
data->ino = ino;
}
grub_disk_read (data->disk,
(((grub_le_to_cpu32 (sblock->inoblk_offs) + grpblk)
<< grub_le_to_cpu32 (data->sblock.log2_blksz)))
@ -358,7 +373,6 @@ grub_ufs_read_inode (struct grub_ufs_data *data, int ino)
(char *) inode);
}
data->ino = ino;
return grub_errno;
}
@ -390,7 +404,7 @@ grub_ufs_lookup_symlink (struct grub_ufs_data *data, int ino)
ino = GRUB_UFS_INODE;
/* Now load in the old inode. */
if (grub_ufs_read_inode (data, ino))
if (grub_ufs_read_inode (data, ino, 0))
return grub_errno;
grub_ufs_find_file (data, symlink);
@ -453,9 +467,10 @@ grub_ufs_find_file (struct grub_ufs_data *data, const char *path)
if (!grub_strcmp (name, filename))
{
dirino = data->ino;
grub_ufs_read_inode (data, grub_le_to_cpu32 (dirent.ino));
if (dirent.filetype == GRUB_UFS_FILETYPE_LNK)
grub_ufs_read_inode (data, grub_le_to_cpu32 (dirent.ino), 0);
if ((INODE_MODE(data) & GRUB_UFS_ATTR_TYPE)
== GRUB_UFS_ATTR_LNK)
{
grub_ufs_lookup_symlink (data, dirino);
if (grub_errno)
@ -475,7 +490,7 @@ grub_ufs_find_file (struct grub_ufs_data *data, const char *path)
next++;
}
if (!(dirent.filetype & GRUB_UFS_FILETYPE_DIR))
if ((INODE_MODE(data) & GRUB_UFS_ATTR_TYPE) != GRUB_UFS_ATTR_DIR)
return grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a directory");
continue;
@ -544,7 +559,8 @@ grub_ufs_mount (grub_disk_t disk)
static grub_err_t
grub_ufs_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
struct grub_ufs_data *data;
struct grub_ufs_sblock *sblock;
@ -554,7 +570,7 @@ grub_ufs_dir (grub_device_t device, const char *path,
if (!data)
return grub_errno;
grub_ufs_read_inode (data, GRUB_UFS_INODE);
grub_ufs_read_inode (data, GRUB_UFS_INODE, 0);
if (grub_errno)
return grub_errno;
@ -570,7 +586,7 @@ grub_ufs_dir (grub_device_t device, const char *path,
if (grub_errno)
goto fail;
if (!(INODE_MODE (data) & GRUB_UFS_ATTR_DIR))
if ((INODE_MODE (data) & GRUB_UFS_ATTR_TYPE) != GRUB_UFS_ATTR_DIR)
{
grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a directory");
goto fail;
@ -586,13 +602,34 @@ grub_ufs_dir (grub_device_t device, const char *path,
{
char filename[dirent.namelen + 1];
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
if (grub_ufs_read_file (data, 0, pos + sizeof (dirent),
dirent.namelen, filename) < 0)
break;
filename[dirent.namelen] = '\0';
if (hook (filename, dirent.filetype == GRUB_UFS_FILETYPE_DIR))
if (data->ufs_type == UFS1)
{
struct grub_ufs_inode inode;
grub_ufs_read_inode (data, dirent.ino, (char *) &inode);
info.dir = ((grub_le_to_cpu16 (inode.mode) & GRUB_UFS_ATTR_TYPE)
== GRUB_UFS_ATTR_DIR);
info.mtime = grub_le_to_cpu64 (inode.mtime);
info.mtimeset = 1;
}
else
{
struct grub_ufs2_inode inode;
grub_ufs_read_inode (data, dirent.ino, (char *) &inode);
info.dir = ((grub_le_to_cpu16 (inode.mode) & GRUB_UFS_ATTR_TYPE)
== GRUB_UFS_ATTR_DIR);
info.mtime = grub_le_to_cpu64 (inode.mtime);
info.mtimeset = 1;
}
if (hook (filename, &info))
break;
}
@ -615,7 +652,7 @@ grub_ufs_open (struct grub_file *file, const char *name)
if (!data)
return grub_errno;
grub_ufs_read_inode (data, 2);
grub_ufs_read_inode (data, 2, 0);
if (grub_errno)
{
grub_free (data);
@ -688,6 +725,34 @@ grub_ufs_label (grub_device_t device, char **label)
return grub_errno;
}
/* Get mtime. */
static grub_err_t
grub_ufs_mtime (grub_device_t device, grub_int32_t *tm)
{
struct grub_ufs_data *data = 0;
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
data = grub_ufs_mount (device->disk);
if (!data)
*tm = 0;
else if (data->ufs_type == UFS1)
*tm = grub_le_to_cpu32 (data->sblock.mtime);
else
*tm = grub_le_to_cpu64 (data->sblock.mtime2);
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
grub_free (data);
return grub_errno;
}
static struct grub_fs grub_ufs_fs =
{
@ -697,6 +762,7 @@ static struct grub_fs grub_ufs_fs =
.read = grub_ufs_read,
.close = grub_ufs_close,
.label = grub_ufs_label,
.mtime = grub_ufs_mtime,
.next = 0
};

14
fs/xfs.c
View file

@ -620,7 +620,8 @@ grub_xfs_mount (grub_disk_t disk)
static grub_err_t
grub_xfs_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
int (*hook) (const char *filename,
const struct grub_dirhook_info *info))
{
struct grub_xfs_data *data = 0;;
struct grub_fshelp_node *fdiro = 0;
@ -633,14 +634,11 @@ grub_xfs_dir (grub_device_t device, const char *path,
enum grub_fshelp_filetype filetype,
grub_fshelp_node_t node)
{
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR);
grub_free (node);
if (filetype == GRUB_FSHELP_DIR)
return hook (filename, 1);
else
return hook (filename, 0);
return 0;
return hook (filename, &info);
}
#ifndef GRUB_UTIL