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

2009-07-06 Daniel Mierswa <impulze@impulze.org>

Browse source 
* commands/search.c (search_fs): Use grub_strcasecmp() for UUID
	comparison.
This commit is contained in:
proski 2009-07-06 20:07:58 +00:00
parent bab7495862
commit e110f4dea7
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-07-06 Daniel Mierswa <impulze@impulze.org>
* commands/search.c (search_fs): Use grub_strcasecmp() for UUID
comparison.
2009-07-05 Pavel Roskin <proski@gnu.org> 2009-07-05 Pavel Roskin <proski@gnu.org>
* include/grub/i386/linux.h (struct linux_kernel_params): * include/grub/i386/linux.h (struct linux_kernel_params):

4
commands/search.c
View file

@ -67,8 +67,10 @@ search_fs (const char *key, const char *var, int no_floppy, int is_uuid)
if (dev) if (dev)
{ {
grub_fs_t fs; grub_fs_t fs;
int (*compare_fn) (const char *, const char *);
fs = grub_fs_probe (dev); fs = grub_fs_probe (dev);
compare_fn = is_uuid ? grub_strcasecmp : grub_strcmp;
#define QUID(x) (is_uuid ? (x)->uuid : (x)->label) #define QUID(x) (is_uuid ? (x)->uuid : (x)->label)
@ -79,7 +81,7 @@ search_fs (const char *key, const char *var, int no_floppy, int is_uuid)
(QUID(fs)) (dev, &quid); (QUID(fs)) (dev, &quid);
if (grub_errno == GRUB_ERR_NONE && quid) if (grub_errno == GRUB_ERR_NONE && quid)
{ {
if (grub_strcmp (quid, key) == 0) if (compare_fn (quid, key) == 0)
{ {
/* Found! */ /* Found! */
count++; count++;