From: Sam Ravnborg <sam@neptun.ravnborg.org>
Date: Sun, 1 Oct 2006 09:48:53 +0000 (+0200)
Subject: kconfig: fix saving alternate kconfig file in parent dir
X-Git-Tag: v2.6.19-rc1~220^2~1
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=9a3d0fe84f9fe296a86ea9315092d31986bc7a3a;p=cascardo%2Flinux.git

kconfig: fix saving alternate kconfig file in parent dir

This fixes bugzilla entry: 7182
http://bugzilla.kernel.org/show_bug.cgi?id=7182

With this patch we no longer append the directory part twice
before saving the config file.
This patch has been sent to Roman Zippel for review with no feedback.
It is so obviously simple that this should be OK to apply it anyway.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 69f96b398c22..66b15ef02931 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -517,7 +517,7 @@ int conf_write(const char *name)
 	fclose(out);
 
 	if (*tmpname) {
-		strcat(dirname, name ? name : conf_get_configname());
+		strcat(dirname, basename);
 		strcat(dirname, ".old");
 		rename(newname, dirname);
 		if (rename(tmpname, newname))