mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-20 22:48:22 +00:00
* grub-core/fs/cpio.c (grub_cpio_dir): Fix a bug with multiple listing.
Explicitly init restart while on it.
This commit is contained in:
1 parent
275568816c
commit
e1ea3ade95
2 files changed
+7
-2
No files matched your search
@@ -1,3 +1,8 @@
|
|||||||
|
2012-02-09 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
|
* grub-core/fs/cpio.c (grub_cpio_dir): Fix a bug with multiple listing.
|
||||||
|
Explicitly init restart while on it.
|
||||||
|
|
||||||
2012-02-09 Vladimir Serbinenko <phcoder@gmail.com>
|
2012-02-09 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
* grub-core/lib/posix_wrap/wchar.h (mbrtowc): Set pwc to zero to avoid
|
* grub-core/lib/posix_wrap/wchar.h (mbrtowc): Set pwc to zero to avoid
|
||||||
|
|||||||
+2
-2
@@ -539,7 +539,7 @@ grub_cpio_dir (grub_device_t device, const char *path_in,
|
|||||||
if (p)
|
if (p)
|
||||||
*p = 0;
|
*p = 0;
|
||||||
|
|
||||||
if (((!prev) || (grub_strcmp (prev, n) != 0)) && *n != 0)
|
if (((!prev) || (grub_strcmp (prev, name) != 0)) && *n != 0)
|
||||||
{
|
{
|
||||||
struct grub_dirhook_info info;
|
struct grub_dirhook_info info;
|
||||||
grub_memset (&info, 0, sizeof (info));
|
grub_memset (&info, 0, sizeof (info));
|
||||||
@@ -554,7 +554,7 @@ grub_cpio_dir (grub_device_t device, const char *path_in,
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
int restart;
|
int restart = 0;
|
||||||
err = handle_symlink (data, name, &path, mode, &restart);
|
err = handle_symlink (data, name, &path, mode, &restart);
|
||||||
grub_free (name);
|
grub_free (name);
|
||||||
if (err)
|
if (err)
|
||||||
|
|||||||
Reference in new issue
Block a user