proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-07-20 22:19:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kern/parser: Introduce terminate_arg() helper

Browse Source 
process_char() and grub_parser_split_cmdline() use similar code for
terminating the most recent argument. Add a helper function for this.

Signed-off-by: Chris Coulson <chris.coulson@canonical.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Chris Coulson 2021-01-07 19:53:55 +00:00 committed by Daniel Kiper
parent b1c9e9e889
commit 3d157bbd06
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
grub-core/kern/parser.c
View File

@ -129,6 +129,16 @@ add_var (char *varname, char **bp, char **vp,
*((*bp)++) = *val;
}
static void
terminate_arg (char *buffer, char **bp, int *argc)
{
if (*bp != buffer && *((*bp) - 1) != '\0')
{
*((*bp)++) = '\0';
(*argc)++;
}
}
static grub_err_t
process_char (char c, char *buffer, char **bp, char *varname, char **vp,
grub_parser_state_t state, int *argc,
@ -157,11 +167,7 @@ process_char (char c, char *buffer, char **bp, char *varname, char **vp,
* Don't add more than one argument if multiple
* spaces are used.
*/
if (*bp != buffer && *((*bp) - 1) != '\0')
{
*((*bp)++) = '\0';
(*argc)++;
}
terminate_arg (buffer, bp, argc);
}
else if (use)
*((*bp)++) = use;
@ -232,11 +238,8 @@ grub_parser_split_cmdline (const char *cmdline,
variable. */
add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT);
if (bp != buffer && *(bp - 1))
{
*(bp++) = '\0';
(*argc)++;
}
/* Ensure that the last argument is terminated. */
terminate_arg (buffer, &bp, argc);
/* If there are no args, then we're done. */
if (!*argc)