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

Fix a problem with kernel command

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-08-27 20:23:39 +02:00
parent fff175c77f
commit 661cf42231
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
grub-core/lib/legacy_parse.c
View file

@ -121,7 +121,7 @@ struct legacy_command legacy_commands[] =
/* install unsupported. */ /* install unsupported. */
/* ioprobe unsupported. */ /* ioprobe unsupported. */
/* FIXME: implement command. */ /* FIXME: implement command. */
{"kernel", "legacy_kernel %s '%s' %s\n", 4, {TYPE_TYPE_OR_NOMEM_OPTION, {"kernel", "legacy_kernel %s %s '%s' %s\n", 4, {TYPE_TYPE_OR_NOMEM_OPTION,
TYPE_TYPE_OR_NOMEM_OPTION, TYPE_TYPE_OR_NOMEM_OPTION,
TYPE_FILE, TYPE_FILE,
TYPE_REST_VERBATIM}, 0, TYPE_REST_VERBATIM}, 0,
@ -380,7 +380,7 @@ grub_legacy_parse (const char *buf, char **entryname)
} }
for (; grub_isspace (*ptr); ptr++); for (; grub_isspace (*ptr); ptr++);
curarg = ptr; curarg = ptr;
for (; !grub_isspace (*ptr); ptr++); for (; *ptr && !grub_isspace (*ptr); ptr++);
if (i != legacy_commands[cmdnum].argc - 1 if (i != legacy_commands[cmdnum].argc - 1
|| (legacy_commands[cmdnum].flags & FLAG_IGNORE_REST)) || (legacy_commands[cmdnum].flags & FLAG_IGNORE_REST))
curarglen = ptr - curarg; curarglen = ptr - curarg;
@ -406,7 +406,7 @@ grub_legacy_parse (const char *buf, char **entryname)
ptr = curarg; ptr = curarg;
while (*ptr) while (*ptr)
{ {
for (; grub_isspace (*ptr); ptr++); for (; *ptr && grub_isspace (*ptr); ptr++);
for (; *ptr && !grub_isspace (*ptr); ptr++) for (; *ptr && !grub_isspace (*ptr); ptr++)
if (*ptr == '\\' || *ptr == '\'') if (*ptr == '\\' || *ptr == '\'')
overhead++; overhead++;
@ -421,7 +421,7 @@ grub_legacy_parse (const char *buf, char **entryname)
outptr = outptr0; outptr = outptr0;
while (*ptr) while (*ptr)
{ {
for (; grub_isspace (*ptr); ptr++); for (; *ptr && grub_isspace (*ptr); ptr++);
if (outptr != outptr0) if (outptr != outptr0)
*outptr++ = ' '; *outptr++ = ' ';
*outptr++ = '\''; *outptr++ = '\'';
@ -434,7 +434,6 @@ grub_legacy_parse (const char *buf, char **entryname)
*outptr++ = '\''; *outptr++ = '\'';
if (*ptr) if (*ptr)
ptr++; ptr++;
overhead += 3;
} }
*outptr++ = 0; *outptr++ = 0;
} }
@ -492,5 +491,7 @@ grub_legacy_parse (const char *buf, char **entryname)
} }
} }
} }
return grub_xasprintf (legacy_commands[cmdnum].map, args[0], args[1], args[2]);
return grub_xasprintf (legacy_commands[cmdnum].map, args[0], args[1], args[2],
args[3]);
} }