Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scripts/config: allow colons in option strings for sed

Browse source 
[ 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>
This commit is contained in:
Jeremie Francois (on alpha) 2020-04-10 18:57:40 +02:00 committed by Greg Kroah-Hartman
parent bbe15f16e5
commit e98ea62e94
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/config
View file

@ -7,6 +7,9 @@ myname=${0##*/}
# If no prefix forced, use the default CONFIG_ # If no prefix forced, use the default CONFIG_
CONFIG_="${CONFIG_-CONFIG_}" CONFIG_="${CONFIG_-CONFIG_}"
# We use an uncommon delimiter for sed substitutions
SED_DELIM=$(echo -en "\001")
usage() { usage() {
cat >&2 <<EOL cat >&2 <<EOL
Manipulate options in a .config file from the command line. Manipulate options in a .config file from the command line.
@ -83,7 +86,7 @@ txt_subst() {
local infile="$3" local infile="$3"
local tmpfile="$infile.swp" 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 # replace original file with the edited one
mv "$tmpfile" "$infile" mv "$tmpfile" "$infile"
} }