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

fix more bugs

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-05-12 18:13:43 +02:00
parent b07e88dc6a
commit 67cb07a31b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
commands/legacycfg.c
View file

@ -66,10 +66,10 @@ struct legacy_command legacy_commands[] =
{"debug", {"debug",
"if [ -z \"$debug\" ]; then set debug=all; else set debug=; fi\n", "if [ -z \"$debug\" ]; then set debug=all; else set debug=; fi\n",
0, {}, 0}, 0, {}, 0},
{"default", "set default='%s'; if [ x\"$default\" = xsaved ]; then load_env; set default=\"$saved_entry\"\n", 1, {TYPE_VERBATIM}, 0}, {"default", "set default='%s'; if [ x\"$default\" = xsaved ]; then load_env; set default=\"$saved_entry\"; fi\n", 1, {TYPE_VERBATIM}, 0},
/* dhcp unsupported. */ /* dhcp unsupported. */
/* displayapm unsupported. */ /* displayapm unsupported. */
{"displaymem", "lsmem\n", 0, {}, 0}, {"displaymem", "lsmmap\n", 0, {}, 0},
/* embed unsupported. */ /* embed unsupported. */
{"fallback", "set fallback='%s'\n", 1, {TYPE_VERBATIM}, 0}, {"fallback", "set fallback='%s'\n", 1, {TYPE_VERBATIM}, 0},
{"find", "search -f '%s'\n", 1, {TYPE_FILE}, 0}, {"find", "search -f '%s'\n", 1, {TYPE_FILE}, 0},
@ -234,7 +234,7 @@ legacy_parse (char *buf, char **entryname)
} }
cmdname = ptr; cmdname = ptr;
for (ptr = buf; !grub_isspace (*ptr) && *ptr != '='; ptr++); for (ptr = buf; *ptr && !grub_isspace (*ptr) && *ptr != '='; ptr++);
if (entryname && grub_strncmp ("title", cmdname, ptr - cmdname) == 0 if (entryname && grub_strncmp ("title", cmdname, ptr - cmdname) == 0
&& ptr - cmdname == sizeof ("title") - 1) && ptr - cmdname == sizeof ("title") - 1)
@ -267,7 +267,7 @@ legacy_parse (char *buf, char **entryname)
unsigned j = 0; unsigned j = 0;
for (i = 0; i < legacy_commands[cmdnum].argc; i++) for (i = 0; i < legacy_commands[cmdnum].argc; i++)
{ {
char *curarg, *cptr = NULL, c; char *curarg, *cptr = NULL, c = 0;
for (; grub_isspace (*ptr); ptr++); for (; grub_isspace (*ptr); ptr++);
curarg = ptr; curarg = ptr;
for (; !grub_isspace (*ptr); ptr++); for (; !grub_isspace (*ptr); ptr++);
@ -451,6 +451,7 @@ legacy_file (const char *filename)
} }
grub_normal_parse_line (parsed, getline); grub_normal_parse_line (parsed, getline);
grub_print_error ();
grub_free (parsed); grub_free (parsed);
} }
else if (parsed) else if (parsed)