Raul Rangel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34243 )
Change subject: kconfig: Use config's full path when generating tmp file ......................................................................
kconfig: Use config's full path when generating tmp file
If KCONFIG_CONFIG is set to a full path, we should generate the tmp file in the same directory instead of the current working directory.
BUG=b:112267918 TEST=emerge-grunt coreboot and verified with print statements that the correct path was used.
Change-Id: Ia21e930a9b0a693f851c34bcde26b34886cbe902 Signed-off-by: Raul E Rangel rrangel@chromium.org --- M util/kconfig/confdata.c 1 file changed, 11 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/34243/1
diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c index fc4a07a..88a65e3 100644 --- a/util/kconfig/confdata.c +++ b/util/kconfig/confdata.c @@ -769,7 +769,7 @@ FILE *out; struct symbol *sym; struct menu *menu; - const char *basename; + const char *basename = NULL; const char *str; char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1]; char *env; @@ -777,13 +777,20 @@ dirname[0] = 0; if (name && name[0]) { struct stat st; - char *slash;
if (!stat(name, &st) && S_ISDIR(st.st_mode)) { strcpy(dirname, name); strcat(dirname, "/"); basename = conf_get_configname(); - } else if ((slash = strrchr(name, '/'))) { + } + } else { + name = conf_get_configname(); + } + + if (!basename) { + char *slash = strrchr(name, '/'); + + if (slash) { int size = slash - name + 1; memcpy(dirname, name, size); dirname[size] = 0; @@ -793,8 +800,7 @@ basename = conf_get_configname(); } else basename = name; - } else - basename = conf_get_configname(); + }
sprintf(newname, "%s%s", dirname, basename); env = getenv("KCONFIG_OVERWRITECONFIG");