All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] scripts/config: properly report and set string options
@ 2012-04-09 12:49 Yann E. MORIN
  2012-04-09 13:22 ` Yann E. MORIN
                   ` (4 more replies)
  0 siblings, 5 replies; 12+ messages in thread
From: Yann E. MORIN @ 2012-04-09 12:49 UTC (permalink / raw)
  To: linux-kbuild; +Cc: Yann E. MORIN, stable, Andi Kleen, Michal Marek

Currently, scripts/config removes the leading double-quote from
string options, but leaves the trailing double-quote.

Also, double-quotes in a string are escaped, but scripts/config
does not unescape those when printing

Finally, scripts/config does not escape double-quotes when setting
string options.

Eg. the current behavior:
    $ grep -E '^CONFIG_FOO=' .config
    CONFIG_FOO="Bar \"Buz\" Meh"
    $ ./scripts/config -s FOO
    Bar \"Buz\" Meh"
    $ ./scripts/config --set-str FOO 'Alpha "Bravo" Charlie'
    $ grep -E '^CONFIG_FOO=' .config
    CONFIG_FOO="Alpha "Bravo" Charlie"

Fix those three, giving this new behavior:
    $ grep -E '^CONFIG_FOO=' .config
    CONFIG_FOO="Bar \"Buz\" Meh"
    $ ./scripts/config -s FOO
    Bar "Buz" Meh
    $ ./scripts/config --set-str FOO 'Alpha "Bravo" Charlie'
    $ grep -E '^CONFIG_FOO=' .config
    CONFIG_FOO="Alpha \"Bravo\" Charlie"

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: stable@vger.kernel.org
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Michal Marek <mmarek@suse.cz>
---
 scripts/config |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/config b/scripts/config
index a7c7c4b..ed6653e 100755
--- a/scripts/config
+++ b/scripts/config
@@ -107,7 +107,8 @@ while [ "$1" != "" ] ; do
 		;;
 
 	--set-str)
-		set_var "CONFIG_$ARG" "CONFIG_$ARG=\"$1\""
+		# sed swallows one level of escaping, so we need double-escaping
+		set_var "CONFIG_$ARG" "CONFIG_$ARG=\"${1//\"/\\\\\"}\""
 		shift
 		;;
 
@@ -124,9 +125,11 @@ while [ "$1" != "" ] ; do
 			if [ $? != 0 ] ; then
 				echo undef
 			else
-				V="${V/CONFIG_$ARG=/}"
-				V="${V/\"/}"
-				echo "$V"
+				V="${V/#CONFIG_$ARG=/}"
+				V="${V/#\"/}"
+				V="${V/%\"/}"
+				V="${V/\\\"/\"}"
+				echo "${V}"
 			fi
 		fi
 		;;
-- 
1.7.2.5


^ permalink raw reply related	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2012-05-15 22:20 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-09 12:49 [PATCH] scripts/config: properly report and set string options Yann E. MORIN
2012-04-09 13:22 ` Yann E. MORIN
2012-04-09 14:04 ` Andi Kleen
2012-04-09 15:30 ` Greg KH
2012-04-09 16:02   ` Yann E. MORIN
2012-04-10  8:57     ` Michal Marek
2012-04-10 13:57     ` Jonathan Nieder
2012-04-10 23:07       ` Yann E. MORIN
2012-04-11  1:33         ` Jonathan Nieder
2012-04-19 21:07 ` Yann E. MORIN
2012-05-15 22:14   ` Michal Marek
2012-05-09 21:27 ` Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.