From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 12 Dec 2014 12:29:58 +0000 (+0000)
Subject: scripts/config: support includes relative to the currently processed file
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2f39014a4843f801e6fdc2ebd77b5523cb38f4b3;p=openwrt%2Fstaging%2Frmilecki.git

scripts/config: support includes relative to the currently processed file

When the initial glob() attempt on a path specified with "source" statement
yields no result, then retry the globbing on the same path with the directory
part of the currently processed file prepended.

This allows us to reference Config.in files relative to their parent instead
of relative to the top dir.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 43652
---

diff --git a/scripts/config/zconf.l b/scripts/config/zconf.l
index 3aef45983aa..1dd765817a7 100644
--- a/scripts/config/zconf.l
+++ b/scripts/config/zconf.l
@@ -343,6 +343,7 @@ void zconf_nextfile(const char *name)
 	glob_t gl;
 	int err;
 	int i;
+	char path[PATH_MAX], *p;
 
 	err = glob(name, GLOB_ERR | GLOB_MARK, NULL, &gl);
 
@@ -352,6 +353,15 @@ void zconf_nextfile(const char *name)
 		gl.gl_pathc = 0;
 	}
 
+	if (err == GLOB_NOMATCH) {
+		p = strdup(current_file->name);
+		if (p) {
+			snprintf(path, sizeof(path), "%s/%s", dirname(p), name);
+			err = glob(path, GLOB_ERR | GLOB_MARK, NULL, &gl);
+			free(p);
+		}
+	}
+
 	if (err) {
 		const char *reason = "unknown error";
 
diff --git a/scripts/config/zconf.lex.c_shipped b/scripts/config/zconf.lex.c_shipped
index 766549fbfed..c938b2fae69 100644
--- a/scripts/config/zconf.lex.c_shipped
+++ b/scripts/config/zconf.lex.c_shipped
@@ -2399,6 +2399,7 @@ void zconf_nextfile(const char *name)
 	glob_t gl;
 	int err;
 	int i;
+	char path[PATH_MAX], *p;
 
 	err = glob(name, GLOB_ERR | GLOB_MARK, NULL, &gl);
 
@@ -2408,6 +2409,16 @@ void zconf_nextfile(const char *name)
 		gl.gl_pathc = 0;
 	}
 
+	if (err == GLOB_NOMATCH) {
+		p = strdup(current_file->name);
+		if (p) {
+			snprintf(path, sizeof(path), "%s/%s", dirname(p), name);
+			fprintf(stderr, "TRY:%s\n", path);
+			err = glob(path, GLOB_ERR | GLOB_MARK, NULL, &gl);
+			free(p);
+		}
+	}
+
 	if (err) {
 		const char *reason = "unknown error";