| Message ID | 0e0a8ad11e2c9c7db02baa1bbb5a30f429586854.1503000577.git.msuchanek@suse.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Thu, 17 Aug 2017 22:14:30 +0200 Michal Suchanek <msuchanek@suse.de> wrote: > 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 ++----- > 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) == '"')) s/shortening/1/ ^ in case somebody would want this patch and not the following one that removes the code.
On 08/17/17 at 10:14pm, Michal Suchanek wrote: > Remove quotes from argument value only if there is qoute on both sides. > > Signed-off-by: Michal Suchanek <msuchanek@suse.de> Sounds reasonable. Just for curiosity, do we have chance to pass in option with a single '"'? > --- > arch/powerpc/kernel/fadump.c | 6 ++---- > lib/cmdline.c | 7 ++----- > 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 >
On Mon, 21 Aug 2017 18:27:12 +0800 Baoquan He <bhe@redhat.com> wrote: > On 08/17/17 at 10:14pm, Michal Suchanek wrote: > > Remove quotes from argument value only if there is qoute on both > > sides. > > > > Signed-off-by: Michal Suchanek <msuchanek@suse.de> > > Sounds reasonable. Just for curiosity, do we have chance to pass in > option with a single '"'? No, we don't. Perhaps it would work if it was at the end of the commandline. next_arg checks that quoting is closed. It was possible but undocumented with previous behavior - you would place the quote in the middle and the closing quote at start or end so that next_arg would remove the closing quote but not the one in the middle. It would be also possible with shell-like backslash escaping but that is not implemented. Thanks Michal
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? 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
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
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';
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 ++----- 2 files changed, 4 insertions(+), 9 deletions(-)