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

directory and hardlink support on romfs

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-12-15 20:24:16 +01:00
parent 29184e9312
commit 921c7932d0
1 changed files with 50 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
grub-core/fs/romfs.c
View file

@ -52,15 +52,16 @@ struct grub_fshelp_node
{ {
grub_disk_addr_t addr; grub_disk_addr_t addr;
struct grub_romfs_data *data; struct grub_romfs_data *data;
/* Used only on regular files. */
grub_disk_addr_t data_addr; grub_disk_addr_t data_addr;
/* Not filled for root. */
struct grub_romfs_file_header file; struct grub_romfs_file_header file;
}; };
#define GRUB_ROMFS_ALIGN 16 #define GRUB_ROMFS_ALIGN 16
#define GRUB_ROMFS_TYPE_MASK 7 #define GRUB_ROMFS_TYPE_MASK 7
#define GRUB_ROMFS_TYPE_REGULAR 2 #define GRUB_ROMFS_TYPE_HARDLINK 0
#define GRUB_ROMFS_TYPE_DIRECTORY 1 #define GRUB_ROMFS_TYPE_DIRECTORY 1
#define GRUB_ROMFS_TYPE_REGULAR 2
static grub_err_t static grub_err_t
do_checksum (void *in, grub_size_t insize) do_checksum (void *in, grub_size_t insize)
@ -145,7 +146,7 @@ grub_romfs_iterate_dir (grub_fshelp_node_t dir,
char *name = NULL; char *name = NULL;
unsigned nptr; unsigned nptr;
unsigned i, j; unsigned i, j;
for (caddr = dir->addr; caddr; for (caddr = dir->data_addr; caddr;
caddr = grub_be_to_cpu32 (hdr.next_file) & ~(GRUB_ROMFS_ALIGN - 1)) caddr = grub_be_to_cpu32 (hdr.next_file) & ~(GRUB_ROMFS_ALIGN - 1))
{ {
grub_disk_addr_t naddr = caddr + sizeof (hdr); grub_disk_addr_t naddr = caddr + sizeof (hdr);
@ -180,7 +181,7 @@ grub_romfs_iterate_dir (grub_fshelp_node_t dir,
naddr & (GRUB_DISK_SECTOR_SIZE - 1), naddr & (GRUB_DISK_SECTOR_SIZE - 1),
16, name + 16 * nptr); 16, name + 16 * nptr);
if (err) if (err)
return err; return 1;
for (j = 0; j < 16; j++) for (j = 0; j < 16; j++)
if (!name[16 * nptr + j]) if (!name[16 * nptr + j])
break; break;
@ -210,8 +211,51 @@ grub_romfs_iterate_dir (grub_fshelp_node_t dir,
filetype = GRUB_FSHELP_REG; filetype = GRUB_FSHELP_REG;
break; break;
case GRUB_ROMFS_TYPE_DIRECTORY: case GRUB_ROMFS_TYPE_DIRECTORY:
node->data_addr = grub_be_to_cpu32 (hdr.spec);
filetype = GRUB_FSHELP_DIR; filetype = GRUB_FSHELP_DIR;
break; break;
case GRUB_ROMFS_TYPE_HARDLINK:
{
grub_disk_addr_t laddr;
node->addr = laddr = grub_be_to_cpu32 (hdr.spec);
err = grub_disk_read (dir->data->disk,
laddr >> GRUB_DISK_SECTOR_BITS,
laddr & (GRUB_DISK_SECTOR_SIZE - 1),
sizeof (node->file), &node->file);
if (err)
return 1;
if ((grub_be_to_cpu32 (node->file.next_file) & GRUB_ROMFS_TYPE_MASK)
== GRUB_ROMFS_TYPE_REGULAR)
{
laddr += sizeof (hdr);
while (1)
{
char buf[16];
err = grub_disk_read (dir->data->disk,
laddr >> GRUB_DISK_SECTOR_BITS,
laddr & (GRUB_DISK_SECTOR_SIZE - 1),
16, buf);
if (err)
return 1;
for (i = 0; i < 16; i++)
if (!buf[i])
break;
if (i != 16)
break;
laddr += 16;
}
node->data_addr = laddr + 16;
filetype = GRUB_FSHELP_REG;
}
if ((grub_be_to_cpu32 (node->file.next_file) & GRUB_ROMFS_TYPE_MASK)
== GRUB_ROMFS_TYPE_DIRECTORY)
{
node->data_addr = grub_be_to_cpu32 (node->file.spec);
filetype = GRUB_FSHELP_DIR;
}
break;
}
} }
if (hook (name, filetype, node)) if (hook (name, filetype, node))
@ -253,6 +297,7 @@ grub_romfs_dir (grub_device_t device, const char *path,
goto fail; goto fail;
start.addr = data->first_file; start.addr = data->first_file;
start.data_addr = data->first_file;
start.data = data; start.data = data;
grub_fshelp_find_file (path, &start, &fdiro, grub_romfs_iterate_dir, grub_fshelp_find_file (path, &start, &fdiro, grub_romfs_iterate_dir,
NULL, GRUB_FSHELP_DIR); NULL, GRUB_FSHELP_DIR);
@ -278,6 +323,7 @@ grub_romfs_open (struct grub_file *file, const char *name)
goto fail; goto fail;
start.addr = data->first_file; start.addr = data->first_file;
start.data_addr = data->first_file;
start.data = data; start.data = data;
grub_fshelp_find_file (name, &start, &fdiro, grub_romfs_iterate_dir, grub_fshelp_find_file (name, &start, &fdiro, grub_romfs_iterate_dir,