From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F34EC4724C for ; Thu, 30 Apr 2020 13:57:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E952520661 for ; Thu, 30 Apr 2020 13:57:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588255078; bh=WDtQyU3LJZ2AHPzFeLcHweDmGIX9L6Ixy02r9QSbulM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zPoN4neKjIbrc/rxMIjLcJuuFHNaoq0TVn5LaNjImTCEvzSkVI40V0wdT9zwu3WsD 0Z3SxRelPFU2SQzYVuXrf2dHLd9wuJ+3y0NH/Bqi09mgMkz77YCQ51sZcJ+60bjgMZ qD4/gdcJrFCVIoDOMRYJyS+DT7+hadrXFa9kIgD0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728214AbgD3N55 (ORCPT ); Thu, 30 Apr 2020 09:57:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:37362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729042AbgD3Nyp (ORCPT ); Thu, 30 Apr 2020 09:54:45 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BA69A24956; Thu, 30 Apr 2020 13:54:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588254885; bh=WDtQyU3LJZ2AHPzFeLcHweDmGIX9L6Ixy02r9QSbulM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g/htdZH+Z05uKLBCK/R26thc4OLiJ6H57QBZRK79z/NrVaeOj+QJeJgAawqOL+Ste atD3s1UcaOK7LwqHyXO4C3HlcOcoJ/nBf3UwzMgDyYjBrfo7I0MRskhuIwr5RLJgyR 02VducJObS0LjJ92g6Yed5XK6IAbEakc9rwBNK14= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Jeremie Francois (on alpha)" , Masahiro Yamada , Sasha Levin Subject: [PATCH AUTOSEL 4.9 10/17] scripts/config: allow colons in option strings for sed Date: Thu, 30 Apr 2020 09:54:26 -0400 Message-Id: <20200430135433.21204-10-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430135433.21204-1-sashal@kernel.org> References: <20200430135433.21204-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Jeremie Francois (on alpha)" [ Upstream commit e461bc9f9ab105637b86065d24b0b83f182d477c ] Sed broke on some strings as it used colon as a separator. I made it more robust by using \001, which is legit POSIX AFAIK. E.g. ./config --set-str CONFIG_USBNET_DEVADDR "de:ad:be:ef:00:01" failed with: sed: -e expression #1, char 55: unknown option to `s' Signed-off-by: Jeremie Francois (on alpha) Signed-off-by: Masahiro Yamada Signed-off-by: Sasha Levin --- scripts/config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/config b/scripts/config index 026aeb4f32ee3..73de17d396987 100755 --- a/scripts/config +++ b/scripts/config @@ -6,6 +6,9 @@ myname=${0##*/} # If no prefix forced, use the default CONFIG_ CONFIG_="${CONFIG_-CONFIG_}" +# We use an uncommon delimiter for sed substitutions +SED_DELIM=$(echo -en "\001") + usage() { cat >&2 <"$tmpfile" + sed -e "s$SED_DELIM$before$SED_DELIM$after$SED_DELIM" "$infile" >"$tmpfile" # replace original file with the edited one mv "$tmpfile" "$infile" } -- 2.20.1