1*4882a593SmuzhiyunFrom 3d157bbd06506b170fde5ec23980c4bf9f7660e2 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Chris Coulson <chris.coulson@canonical.com> 3*4882a593SmuzhiyunDate: Thu, 7 Jan 2021 19:53:55 +0000 4*4882a593SmuzhiyunSubject: [PATCH] kern/parser: Introduce terminate_arg() helper 5*4882a593Smuzhiyun 6*4882a593Smuzhiyunprocess_char() and grub_parser_split_cmdline() use similar code for 7*4882a593Smuzhiyunterminating the most recent argument. Add a helper function for this. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Chris Coulson <chris.coulson@canonical.com> 10*4882a593SmuzhiyunReviewed-by: Daniel Kiper <daniel.kiper@oracle.com> 11*4882a593SmuzhiyunSigned-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> 12*4882a593Smuzhiyun--- 13*4882a593Smuzhiyun grub-core/kern/parser.c | 23 +++++++++++++---------- 14*4882a593Smuzhiyun 1 file changed, 13 insertions(+), 10 deletions(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c 17*4882a593Smuzhiyunindex 0d3582b..572c670 100644 18*4882a593Smuzhiyun--- a/grub-core/kern/parser.c 19*4882a593Smuzhiyun+++ b/grub-core/kern/parser.c 20*4882a593Smuzhiyun@@ -129,6 +129,16 @@ add_var (char *varname, char **bp, char **vp, 21*4882a593Smuzhiyun *((*bp)++) = *val; 22*4882a593Smuzhiyun } 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun+static void 25*4882a593Smuzhiyun+terminate_arg (char *buffer, char **bp, int *argc) 26*4882a593Smuzhiyun+{ 27*4882a593Smuzhiyun+ if (*bp != buffer && *((*bp) - 1) != '\0') 28*4882a593Smuzhiyun+ { 29*4882a593Smuzhiyun+ *((*bp)++) = '\0'; 30*4882a593Smuzhiyun+ (*argc)++; 31*4882a593Smuzhiyun+ } 32*4882a593Smuzhiyun+} 33*4882a593Smuzhiyun+ 34*4882a593Smuzhiyun static grub_err_t 35*4882a593Smuzhiyun process_char (char c, char *buffer, char **bp, char *varname, char **vp, 36*4882a593Smuzhiyun grub_parser_state_t state, int *argc, 37*4882a593Smuzhiyun@@ -157,11 +167,7 @@ process_char (char c, char *buffer, char **bp, char *varname, char **vp, 38*4882a593Smuzhiyun * Don't add more than one argument if multiple 39*4882a593Smuzhiyun * spaces are used. 40*4882a593Smuzhiyun */ 41*4882a593Smuzhiyun- if (*bp != buffer && *((*bp) - 1) != '\0') 42*4882a593Smuzhiyun- { 43*4882a593Smuzhiyun- *((*bp)++) = '\0'; 44*4882a593Smuzhiyun- (*argc)++; 45*4882a593Smuzhiyun- } 46*4882a593Smuzhiyun+ terminate_arg (buffer, bp, argc); 47*4882a593Smuzhiyun } 48*4882a593Smuzhiyun else if (use) 49*4882a593Smuzhiyun *((*bp)++) = use; 50*4882a593Smuzhiyun@@ -232,11 +238,8 @@ grub_parser_split_cmdline (const char *cmdline, 51*4882a593Smuzhiyun variable. */ 52*4882a593Smuzhiyun add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT); 53*4882a593Smuzhiyun 54*4882a593Smuzhiyun- if (bp != buffer && *(bp - 1)) 55*4882a593Smuzhiyun- { 56*4882a593Smuzhiyun- *(bp++) = '\0'; 57*4882a593Smuzhiyun- (*argc)++; 58*4882a593Smuzhiyun- } 59*4882a593Smuzhiyun+ /* Ensure that the last argument is terminated. */ 60*4882a593Smuzhiyun+ terminate_arg (buffer, &bp, argc); 61*4882a593Smuzhiyun 62*4882a593Smuzhiyun /* If there are no args, then we're done. */ 63*4882a593Smuzhiyun if (!*argc) 64*4882a593Smuzhiyun-- 65*4882a593Smuzhiyun2.14.2 66*4882a593Smuzhiyun 67