Re: [PATCH v7 3/4] lib/cmdline.c Remove quotes symmetrically.
From: Baoquan He <hidden>
Date: 2017-08-21 10:27:20
Also in:
lkml
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 <redacted>
Sounds reasonable. Just for curiosity, do we have chance to pass in option with a single '"'?
quoted hunk ↗ jump to hunk
--- 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