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

* grub-core/fs/jfs.c (grub_jfs_find_file): Handle "." and "..".

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-27 01:03:26 +02:00
parent 80a3dc3fb4
commit 8b43f587ae
2 changed files with 49 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-05-27 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/jfs.c (grub_jfs_find_file): Handle "." and "..".
2012-05-27 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/ntfs.c (list_file): Set mtime to correct value.

46
grub-core/fs/jfs.c
View file

@ -672,9 +672,53 @@ grub_jfs_find_file (struct grub_jfs_data *data, const char *path,
for (;;)
{
if (grub_strlen (name) == 0)
if (name[0] == 0)
return GRUB_ERR_NONE;
if (name[0] == '.' && name[1] == 0)
{
if (!next)
return 0;
name = next;
next = grub_strchr (name, '/');
while (next && *next == '/')
{
next[0] = '\0';
next++;
}
continue;
}
if (name[0] == '.' && name[1] == '.' && name[2] == 0)
{
grub_uint32_t ino = grub_le_to_cpu32 (data->currinode.dir.header.idotdot);
grub_jfs_closedir (diro);
diro = 0;
if (grub_jfs_read_inode (data, ino, &data->currinode))
break;
if (!next)
return 0;
name = next;
next = grub_strchr (name, '/');
while (next && *next == '/')
{
next[0] = '\0';
next++;
}
/* Open this directory for reading dirents. */
diro = grub_jfs_opendir (data, &data->currinode);
if (!diro)
return grub_errno;
continue;
}
if (grub_jfs_getent (diro) == GRUB_ERR_OUT_OF_RANGE)
break;