Re: [PATCH] init/main.c: Remove redundant space from saved_command_line

[Google]

On Thu, 11 Apr 2024 09:19:32 +0200
Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> wrote:

> CC Hiramatsu-san (now for real :-)

Thanks!

> 
> On Thu, Apr 11, 2024 at 6:13 AM Yuntao Wang <ytcoode@xxxxxxxxx> wrote:
> > extra_init_args ends with a space, so when concatenating extra_init_args
> > to saved_command_line, be sure to remove the extra space.

Hi Yuntao,

Hmm, if you want to trim the end space, you should trim extra_init_args
itself instead of this adjustment. Also, can you share the example?

Thank you,

> >
> > Signed-off-by: Yuntao Wang <ytcoode@xxxxxxxxx>
> > ---
> >  init/main.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/init/main.c b/init/main.c
> > index 2ca52474d0c3..cf2c22aa0e8c 100644
> > --- a/init/main.c
> > +++ b/init/main.c
> > @@ -660,12 +660,14 @@ static void __init setup_command_line(char *command_line)
> >                         strcpy(saved_command_line + len, extra_init_args);
> >                         len += ilen - 4;        /* strlen(extra_init_args) */
> >                         strcpy(saved_command_line + len,
> > -                               boot_command_line + initargs_offs - 1);
> > +                               boot_command_line + initargs_offs);
> >                 } else {
> >                         len = strlen(saved_command_line);
> >                         strcpy(saved_command_line + len, " -- ");
> >                         len += 4;
> >                         strcpy(saved_command_line + len, extra_init_args);
> > +                       len += ilen - 4; /* strlen(extra_init_args) */
> > +                       saved_command_line[len-1] = '\0'; /* remove trailing space */
> >                 }
> >         }
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> -- 
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68korg
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds
> 


-- 
Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>