Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kconfig updates from Michal Marek:
 "This is the kconfig part of kbuild for v3.12-rc1:
   - post-3.11 search code fixes and micro-optimizations
   - CONFIG_MODULES is no longer a special case; this is needed to
     eventually fix the bug that using KCONFIG_ALLCONFIG breaks
     allmodconfig
   - long long is used to store hex and int values
   - make silentoldconfig no longer warns when a symbol changes from
     tristate to bool (it's a job for make oldconfig)
   - scripts/diffconfig updated to work with newer Pythons
   - scripts/config does not rely on GNU sed extensions"

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kconfig: do not allow more than one symbol to have 'option modules'
  kconfig: regenerate bison parser
  kconfig: do not special-case 'MODULES' symbol
  diffconfig: Update script to support python versions 2.5 through 3.3
  diffconfig: Gracefully exit if the default config files are not present
  modules: do not depend on kconfig to set 'modules' option to symbol MODULES
  kconfig: silence warning when parsing auto.conf when a symbol has changed type
  scripts/config: use sed's POSIX interface
  kconfig: switch to "long long" for sanity
  kconfig: simplify symbol-search code
  kconfig: don't allocate n+1 elements in temporary array
  kconfig: minor style fixes in symbol-search code
  kconfig/[mn]conf: shorten title in search-box
  kconfig: avoid multiple calls to strlen
  Documentation/kconfig: more concise and straightforward search explanation

1 files changed, 41 insertions, 3 deletions

diff --git a/scripts/config b/scripts/config
index 567120a87c39..2283be2bb62c 100755
--- a/scripts/config
+++ b/scripts/config
@@ -62,15 +62,52 @@ checkarg() {
         fi
 }
 
+txt_append() {
+        local anchor="$1"
+        local insert="$2"
+        local infile="$3"
+        local tmpfile="$infile.swp"
+
+        # sed append cmd: 'a\' + newline + text + newline
+        cmd="$(printf "a\\%b$insert" "\n")"
+
+        sed -e "/$anchor/$cmd" "$infile" >"$tmpfile"
+        # replace original file with the edited one
+        mv "$tmpfile" "$infile"
+}
+
+txt_subst() {
+        local before="$1"
+        local after="$2"
+        local infile="$3"
+        local tmpfile="$infile.swp"
+
+        sed -e "s/$before/$after/" "$infile" >"$tmpfile"
+        # replace original file with the edited one
+        mv "$tmpfile" "$infile"
+}
+
+txt_delete() {
+        local text="$1"
+        local infile="$2"
+        local tmpfile="$infile.swp"
+
+        sed -e "/$text/d" "$infile" >"$tmpfile"
+        # replace original file with the edited one
+        mv "$tmpfile" "$infile"
+}
+
 set_var() {
         local name=$1 new=$2 before=$3
 
         name_re="^($name=|# $name is not set)"
         before_re="^($before=|# $before is not set)"
         if test -n "$before" && grep -Eq "$before_re" "$FN"; then
-                sed -ri "/$before_re/a $new" "$FN"
+                txt_append "^$before=" "$new" "$FN"
+                txt_append "^# $before is not set" "$new" "$FN"
         elif grep -Eq "$name_re" "$FN"; then
-                sed -ri "s:$name_re.*:$new:" "$FN"
+                txt_subst "^$name=.*" "$new" "$FN"
+                txt_subst "^# $name is not set" "$new" "$FN"
         else
                 echo "$new" >>"$FN"
         fi
@@ -79,7 +116,8 @@ set_var() {
 undef_var() {
         local name=$1
 
-        sed -ri "/^($name=|# $name is not set)/d" "$FN"
+        txt_delete "^$name=" "$FN"
+        txt_delete "^# $name is not set" "$FN"
 }
 
 if [ "$1" = "--file" ]; then