kconfig: allow multiple inclusion of the same file

Allow 'source'ing the same file from multiple places (eg. from
different files, and/or under different conditions).

To avoid circular inclusion, scan the source-ancestry of the
current file, and abort if already sourced in this branch.

Regenerate the pre-parsed lex.zconf.c_shipped file.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Michal Marek <mmarek@suse.cz>

1 files changed, 19 insertions, 10 deletions

diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 3dbaec185cc4..f23e3affa9b5 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -299,6 +299,7 @@ void zconf_initscan(const char *name)
 
 void zconf_nextfile(const char *name)
 {
+        struct file *iter;
         struct file *file = file_lookup(name);
         struct buffer *buf = malloc(sizeof(*buf));
         memset(buf, 0, sizeof(*buf));
@@ -314,16 +315,24 @@ void zconf_nextfile(const char *name)
         buf->parent = current_buf;
         current_buf = buf;
 
-        if (file->flags & FILE_BUSY) {
-                printf("%s:%d: do not source '%s' from itself\n",
-                       zconf_curname(), zconf_lineno(), name);
-                exit(1);
-        }
-        if (file->flags & FILE_SCANNED) {
-                printf("%s:%d: file '%s' is already sourced from '%s'\n",
-                       zconf_curname(), zconf_lineno(), name,
-                       file->parent->name);
-                exit(1);
+        for (iter = current_file->parent; iter; iter = iter->parent ) {
+                if (!strcmp(current_file->name,iter->name) ) {
+                        printf("%s:%d: recursive inclusion detected. "
+                               "Inclusion path:\n  current file : '%s'\n",
+                               zconf_curname(), zconf_lineno(),
+                               zconf_curname());
+                        iter = current_file->parent;
+                        while (iter && \
+                               strcmp(iter->name,current_file->name)) {
+                                printf("  included from: '%s:%d'\n",
+                                       iter->name, iter->lineno-1);
+                                iter = iter->parent;
+                        }
+                        if (iter)
+                                printf("  included from: '%s:%d'\n",
+                                       iter->name, iter->lineno+1);
+                        exit(1);
+                }
         }
         file->flags |= FILE_BUSY;
         file->lineno = 1;