From 8ee1101a97e7ece36fcb39b1f3b0b17fd6bbc9c2 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Sat, 14 Jan 2012 11:46:13 +0100 Subject: [PATCH] * grub-core/fs/fshelp.c (grub_fshelp_find_file): Use grub_strcasecmp rather than a hack for grub_strncasemap. --- ChangeLog | 18 ++++++++++++++++++ grub-core/fs/fshelp.c | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 28cb5d792..c92e91aa9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2012-01-14 Vladimir Serbinenko + + * grub-core/fs/fshelp.c (grub_fshelp_find_file): Use grub_strcasecmp + rather than a hack for grub_strncasemap. + +2012-01-14 Vladimir Serbinenko + + Support multiple initrds + Note: part of this was accidently committed in r3739. + + * grub-core/loader/i386/linux.c (grub_cmd_initrd): Support multiple + initrd. + * grub-core/loader/i386/pc/linux.c (grub_cmd_initrd): Likewise. + * grub-core/loader/ia64/efi/linux.c (grub_cmd_initrd): Likewise. + * grub-core/loader/mips/linux.c (grub_cmd_initrd): Likewise. + * grub-core/loader/powerpc/ieee1275/linux.c (grub_cmd_initrd): Likewise. + * grub-core/loader/sparc64/ieee1275/linux.c (grub_cmd_initrd): Likewise. + 2012-01-14 Vladimir Serbinenko * grub-core/disk/dmraid_nvidia.c (grub_dmraid_nv_detect): Skip diff --git a/grub-core/fs/fshelp.c b/grub-core/fs/fshelp.c index 275cb9e1b..0944cf8c3 100644 --- a/grub-core/fs/fshelp.c +++ b/grub-core/fs/fshelp.c @@ -84,7 +84,7 @@ grub_fshelp_find_file (const char *path, grub_fshelp_node_t rootnode, if (filetype == GRUB_FSHELP_UNKNOWN || (grub_strcmp (name, filename) && (! (filetype & GRUB_FSHELP_CASE_INSENSITIVE) || - grub_strncasecmp (name, filename, GRUB_LONG_MAX)))) + grub_strcasecmp (name, filename)))) { grub_free (node); return 0;