Commit f094f8a1 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Michal Marek
Browse files

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: default avatar"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 466de918

scripts/kconfig/lex.zconf.c_shipped

+19 −10
Original line number Diff line number Diff line
@@ -2368,6 +2368,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));
@@ -2383,16 +2384,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);

	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);

		}

	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);

	}

	file->flags |= FILE_BUSY;

	file->lineno = 1;

scripts/kconfig/zconf.l

+19 −10
Original line number Diff line number Diff line
@@ -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);

	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);

		}

	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);

	}

	file->flags |= FILE_BUSY;

	file->lineno = 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE