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

exfat: Save the matching directory entry struct when searching

Browse source 
This provides the node's attributes outside the iterator function
so the file modification time can be accessed and reported.

Signed-off-by: David Michael <fedora.dm0@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
David Michael 2020-03-07 00:59:31 -05:00 • committed by Daniel Kiper
parent 1657e72f5b
commit 8ad7c23864
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
grub-core/fs/fat.c
View file

@ -596,6 +596,7 @@ struct grub_fat_iterate_context
{ {
#ifdef MODE_EXFAT #ifdef MODE_EXFAT
struct grub_fat_dir_node dir; struct grub_fat_dir_node dir;
struct grub_fat_dir_entry entry;
#else #else
struct grub_fat_dir_entry dir; struct grub_fat_dir_entry dir;
#endif #endif
@ -642,27 +643,27 @@ grub_fat_iterate_dir_next (grub_fshelp_node_t node,
grub_memset (&ctxt->dir, 0, sizeof (ctxt->dir)); grub_memset (&ctxt->dir, 0, sizeof (ctxt->dir));
while (1) while (1)
{ {
struct grub_fat_dir_entry dir; struct grub_fat_dir_entry *dir = &ctxt->entry;
ctxt->offset += sizeof (dir); ctxt->offset += sizeof (*dir);
if (grub_fat_read_data (node->disk, node, 0, 0, ctxt->offset, sizeof (dir), if (grub_fat_read_data (node->disk, node, 0, 0, ctxt->offset, sizeof (*dir),
(char *) &dir) (char *) dir)
!= sizeof (dir)) != sizeof (*dir))
break; break;
if (dir.entry_type == 0) if (dir->entry_type == 0)
break; break;
if (!(dir.entry_type & 0x80)) if (!(dir->entry_type & 0x80))
continue; continue;
if (dir.entry_type == 0x85) if (dir->entry_type == 0x85)
{ {
unsigned i, nsec, slots = 0; unsigned i, nsec, slots = 0;
nsec = dir.type_specific.file.secondary_count; nsec = dir->type_specific.file.secondary_count;
ctxt->dir.attr = grub_cpu_to_le16 (dir.type_specific.file.attr); ctxt->dir.attr = grub_cpu_to_le16 (dir->type_specific.file.attr);
ctxt->dir.have_stream = 0; ctxt->dir.have_stream = 0;
for (i = 0; i < nsec; i++) for (i = 0; i < nsec; i++)
{ {
@ -705,7 +706,7 @@ grub_fat_iterate_dir_next (grub_fshelp_node_t node,
if (i != nsec) if (i != nsec)
{ {
ctxt->offset -= sizeof (dir); ctxt->offset -= sizeof (*dir);
continue; continue;
} }
@ -715,16 +716,16 @@ grub_fat_iterate_dir_next (grub_fshelp_node_t node,
return 0; return 0;
} }
/* Allocation bitmap. */ /* Allocation bitmap. */
if (dir.entry_type == 0x81) if (dir->entry_type == 0x81)
continue; continue;
/* Upcase table. */ /* Upcase table. */
if (dir.entry_type == 0x82) if (dir->entry_type == 0x82)
continue; continue;
/* Volume label. */ /* Volume label. */
if (dir.entry_type == 0x83) if (dir->entry_type == 0x83)
continue; continue;
grub_dprintf ("exfat", "unknown primary type 0x%02x\n", grub_dprintf ("exfat", "unknown primary type 0x%02x\n",
dir.entry_type); dir->entry_type);
} }
return grub_errno ? : GRUB_ERR_EOF; return grub_errno ? : GRUB_ERR_EOF;
} }