2009-04-05 Vladimir Serbinenko <phcoder@gmail.com>
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
parent
8a7e1a145f
commit
05aaebfb7b
48 changed files with 834 additions and 443 deletions
116
fs/ufs.c
116
fs/ufs.c
|
|
@ -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
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue