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

2009-06-22 Robert Millan <rmh.grub@aybabtu.com>

Browse source 
* commands/search.c (grub_cmd_search): Macroify hardcoded args[]
        indexes.  Check for -f explicitly.
This commit is contained in:
robertmh 2009-06-22 19:44:38 +00:00
parent 132a0a595f
commit c952cf92a1
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-06-22 Robert Millan <rmh.grub@aybabtu.com>
* commands/search.c (grub_cmd_search): Macroify hardcoded args[]
indexes. Check for -f explicitly.
2009-06-22 Robert Millan <rmh.grub@aybabtu.com> 2009-06-22 Robert Millan <rmh.grub@aybabtu.com>
* conf/i386-pc.rmk (GRUB_MEMORY_MACHINE_LINK_ADDR): Rename to ... * conf/i386-pc.rmk (GRUB_MEMORY_MACHINE_LINK_ADDR): Rename to ...

25
commands/search.c
View file

@ -37,6 +37,15 @@ static const struct grub_arg_option options[] =
{0, 0, 0, 0, 0, 0} {0, 0, 0, 0, 0, 0}
}; };
enum options
{
SEARCH_FILE,
SEARCH_LABEL,
SEARCH_FS_UUID,
SEARCH_SET,
SEARCH_NO_FLOPPY,
};
static void static void
search_fs (const char *key, const char *var, int no_floppy, int is_uuid) search_fs (const char *key, const char *var, int no_floppy, int is_uuid)
{ {
@ -165,15 +174,17 @@ grub_cmd_search (grub_extcmd_t cmd, int argc, char **args)
if (argc == 0) if (argc == 0)
return grub_error (GRUB_ERR_INVALID_COMMAND, "no argument specified"); return grub_error (GRUB_ERR_INVALID_COMMAND, "no argument specified");
if (state[3].set) if (state[SEARCH_SET].set)
var = state[3].arg ? state[3].arg : "root"; var = state[SEARCH_SET].arg ? state[SEARCH_SET].arg : "root";
if (state[1].set) if (state[SEARCH_LABEL].set)
search_fs (args[0], var, state[4].set, 0); search_fs (args[0], var, state[SEARCH_NO_FLOPPY].set, 0);
else if (state[2].set) else if (state[SEARCH_FS_UUID].set)
search_fs (args[0], var, state[4].set, 1); search_fs (args[0], var, state[SEARCH_NO_FLOPPY].set, 1);
else if (state[SEARCH_FILE].set)
search_file (args[0], var, state[SEARCH_NO_FLOPPY].set);
else else
search_file (args[0], var, state[4].set); return grub_error (GRUB_ERR_INVALID_COMMAND, "unspecified search type");
return grub_errno; return grub_errno;
} }