From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752358AbdHXMP2 (ORCPT ); Thu, 24 Aug 2017 08:15:28 -0400 Received: from mx2.suse.de ([195.135.220.15]:38415 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751285AbdHXMP1 (ORCPT ); Thu, 24 Aug 2017 08:15:27 -0400 Date: Thu, 24 Aug 2017 14:15:20 +0200 From: msuchanek To: Michael Ellerman Cc: Benjamin Herrenschmidt , Paul Mackerras , Jonathan Corbet , Jessica Yu , Rusty Russell , Jason Baron , Hari Bathini , Mahesh J Salgaonkar , Daniel Axtens , Andrew Morton , Thiago Jung Bauermann , Balbir Singh , Nicholas Piggin , Michael Neuling , "Aneesh Kumar K.V" , Christophe Leroy , Scott Wood , "Oliver O'Halloran" , David Howells , "Sylvain 'ythier' Hitier" , Ingo Molnar , Kees Cook , Thomas Gleixner , Baoquan He , linux-doc@vger.kernel.org, Lokesh Vutla , Viresh Kumar , linux-kernel@vger.kernel.org, "Steven Rostedt, " , Tejun Heo , Ilya Matveychikov , linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v7 3/4] lib/cmdline.c Remove quotes symmetrically. Message-ID: <20170824141520.449e9f63@naga> In-Reply-To: <87valdut2g.fsf@concordia.ellerman.id.au> References: <78655b3689f6cd0c76b787b8ef2c824ef75a99a5.1503000577.git.msuchanek@suse.de> <0e0a8ad11e2c9c7db02baa1bbb5a30f429586854.1503000577.git.msuchanek@suse.de> <87valdut2g.fsf@concordia.ellerman.id.au> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-suse-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 24 Aug 2017 21:02:47 +1000 Michael Ellerman wrote: > Michal Suchanek writes: > > > Remove quotes from argument value only if there is qoute on both > > sides. > > > > Signed-off-by: Michal Suchanek > > --- > > 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