lkml.org 
[lkml]   [2017]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v7 3/4] lib/cmdline.c Remove quotes symmetrically.
On Thu, 24 Aug 2017 21:02:47 +1000
Michael Ellerman <mpe@ellerman.id.au> wrote:

> Michal Suchanek <msuchanek@suse.de> writes:
>
> > Remove quotes from argument value only if there is qoute on both
> > sides.
> >
> > Signed-off-by: Michal Suchanek <msuchanek@suse.de>
> > ---
> > arch/powerpc/kernel/fadump.c | 6 ++----
> > lib/cmdline.c | 7 ++-----
>
> Can you split that into two patches?

Not really. There is logic in lib/cmdline.c which is duplicated in
arch/powerpc/kernel/fadump.c and so the two places should be updated in
sync.

Thanks

Michal

>
> cheers
>
> > 2 files changed, 4 insertions(+), 9 deletions(-)
> >
> > diff --git a/arch/powerpc/kernel/fadump.c
> > b/arch/powerpc/kernel/fadump.c index a1614d9b8a21..d7da4ce9f7ae
> > 100644 --- a/arch/powerpc/kernel/fadump.c
> > +++ b/arch/powerpc/kernel/fadump.c
> > @@ -489,10 +489,8 @@ static void __init fadump_update_params(struct
> > param_info *param_info, *tgt++ = ' ';
> >
> > /* next_arg removes one leading and one trailing '"' */
> > - if (*tgt == '"')
> > - shortening += 1;
> > - if (*(tgt + vallen + shortening) == '"')
> > - shortening += 1;
> > + if ((*tgt == '"') && (*(tgt + vallen + shortening) == '"'))
> > + shortening += 2;
> >
> > /* remove one leading and one trailing quote if both are
> > present */ if ((val[0] == '"') && (val[vallen - 1] == '"')) {
> > diff --git a/lib/cmdline.c b/lib/cmdline.c
> > index 4c0888c4a68d..01e701b2afe8 100644
> > --- a/lib/cmdline.c
> > +++ b/lib/cmdline.c
> > @@ -227,14 +227,11 @@ char *next_arg(char *args, char **param, char
> > **val) *val = args + equals + 1;
> >
> > /* Don't include quotes in value. */
> > - if (**val == '"') {
> > + if ((**val == '"') && (args[i-1] == '"')) {
> > (*val)++;
> > - if (args[i-1] == '"')
> > - args[i-1] = '\0';
> > + args[i-1] = '\0';
> > }
> > }
> > - if (quoted && args[i-1] == '"')
> > - args[i-1] = '\0';
> >
> > if (args[i]) {
> > args[i] = '\0';
> > --
> > 2.10.2

\
 
 \ /
  Last update: 2017-08-24 14:15    [W:0.111 / U:1.820 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site