| From 070f0ae86da66283919c6c68fe89f8b3dd5f1c60 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 10 Apr 2020 18:57:40 +0200 |
| Subject: scripts/config: allow colons in option strings for sed |
| |
| From: Jeremie Francois (on alpha) <jeremie.francois@gmail.com> |
| |
| [ 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) <jeremie.francois@gmail.com> |
| Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| scripts/config | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/scripts/config b/scripts/config |
| index e0e39826dae90..eee5b7f3a092a 100755 |
| --- a/scripts/config |
| +++ b/scripts/config |
| @@ -7,6 +7,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 <<EOL |
| Manipulate options in a .config file from the command line. |
| @@ -83,7 +86,7 @@ txt_subst() { |
| local infile="$3" |
| local tmpfile="$infile.swp" |
| |
| - sed -e "s:$before:$after:" "$infile" >"$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 |
| |
