Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e3e10c7 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: send error messages to stderr 



These messages should be directed to stderr.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarUlf Magnusson <ulfalizer@gmail.com>
parent f3ff6fb5

scripts/kconfig/conf.c

+6 −4
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ int main(int ac, char **av) 
		}

	}

	if (ac == optind) {

		printf(_("%s: Kconfig file missing\n"), av[0]);

		fprintf(stderr, _("%s: Kconfig file missing\n"), av[0]);

		conf_usage(progname);

		exit(1);

	}
@@ -573,9 +573,11 @@ int main(int ac, char **av) 
		if (!defconfig_file)

			defconfig_file = conf_get_default_confname();

		if (conf_read(defconfig_file)) {

			printf(_("***\n"

			fprintf(stderr,

				_("***\n"

				  "*** Can't find default configuration \"%s\"!\n"

				"***\n"), defconfig_file);

				  "***\n"),

				defconfig_file);

			exit(1);

		}

		break;

scripts/kconfig/expr.c

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ struct expr *expr_copy(const struct expr *org) 
		e->right.expr = expr_copy(org->right.expr);

		break;

	default:

		printf("can't copy type %d\n", e->type);

		fprintf(stderr, "can't copy type %d\n", e->type);

		free(e);

		e = NULL;

		break;
@@ -127,7 +127,7 @@ void expr_free(struct expr *e) 
		expr_free(e->right.expr);

		break;

	default:

		printf("how to free type %d?\n", e->type);

		fprintf(stderr, "how to free type %d?\n", e->type);

		break;

	}

	free(e);

scripts/kconfig/symbol.c

+1 −1
Original line number Diff line number Diff line
@@ -1221,7 +1221,7 @@ static struct symbol *sym_check_expr_deps(struct expr *e) 
	default:

		break;

	}

	printf("Oops! How to check %d?\n", e->type);

	fprintf(stderr, "Oops! How to check %d?\n", e->type);

	return NULL;

}

scripts/kconfig/zconf.l

+15 −12
Original line number Diff line number Diff line
@@ -184,7 +184,9 @@ n [A-Za-z0-9_-] 
			append_string(yytext, 1);

	}

	\n	{

		printf("%s:%d:warning: multi-line strings not supported\n", zconf_curname(), zconf_lineno());

		fprintf(stderr,

			"%s:%d:warning: multi-line strings not supported\n",

			zconf_curname(), zconf_lineno());

		current_file->lineno++;

		BEGIN(INITIAL);

		return T_EOL;
@@ -294,7 +296,7 @@ void zconf_initscan(const char *name) 
{

	yyin = zconf_fopen(name);

	if (!yyin) {

		printf("can't find file %s\n", name);

		fprintf(stderr, "can't find file %s\n", name);

		exit(1);

	}
@@ -315,7 +317,7 @@ void zconf_nextfile(const char *name) 
	current_buf->state = YY_CURRENT_BUFFER;

	yyin = zconf_fopen(file->name);

	if (!yyin) {

		printf("%s:%d: can't open file \"%s\"\n",

		fprintf(stderr, "%s:%d: can't open file \"%s\"\n",

			zconf_curname(), zconf_lineno(), file->name);

		exit(1);

	}
@@ -325,19 +327,20 @@ void zconf_nextfile(const char *name) 


	for (iter = current_file->parent; iter; iter = iter->parent ) {

		if (!strcmp(current_file->name,iter->name) ) {

			printf("%s:%d: recursive inclusion detected. "

			fprintf(stderr,

				"%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",

				fprintf(stderr, "  included from: '%s:%d'\n",

					iter->name, iter->lineno-1);

				iter = iter->parent;

			}

			if (iter)

				printf("  included from: '%s:%d'\n",

				fprintf(stderr, "  included from: '%s:%d'\n",

					iter->name, iter->lineno+1);

			exit(1);

		}