From patchwork Fri Jun 29 13:18:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Gouders X-Patchwork-Id: 10496567 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 16C65601C7 for ; Fri, 29 Jun 2018 13:18:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03AD929760 for ; Fri, 29 Jun 2018 13:18:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC61C29766; Fri, 29 Jun 2018 13:18:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=2.0 tests=BAYES_00, DKIM_ADSP_DISCARD, DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36E3729760 for ; Fri, 29 Jun 2018 13:18:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936507AbeF2NSs (ORCPT ); Fri, 29 Jun 2018 09:18:48 -0400 Received: from services.gouders.net ([141.101.32.176]:58146 "EHLO services.gouders.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932776AbeF2NSp (ORCPT ); Fri, 29 Jun 2018 09:18:45 -0400 Received: from lena.gouders.net ([193.175.198.193]) (authenticated bits=0) by services.gouders.net (8.14.8/8.14.8) with ESMTP id w5TDISxY023092 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Fri, 29 Jun 2018 15:18:39 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gouders.net; s=gnet; t=1530278320; bh=GqiwJ4zMShW3G+nytlpN5A+JvyWYVyLyEO+WeSqbh3I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ndrC+p8wz6uF0sjUZ7Rgsocf8DGL5ohz0MFJG+ERYSOUx5kn31ia2K7kSsdrYtltl djeD1E9Lo186AdDFBcdOfIB/+1E7p/HgMsYrJ9GXBCQCLuovKwCRD9cH3w/z7sEs+w 8yXf9zJNBaYwx3WIqJo0dgHMWbecz/16+oI7KE74= From: Dirk Gouders To: Masahiro Yamada Cc: Dirk Gouders , Linux Kbuild mailing list Subject: [PATCH v4 1/1] kconfig: expr_print(): print constant symbols within quotes Date: Fri, 29 Jun 2018 15:18:24 +0200 Message-Id: <20180629131824.25248-2-dirk@gouders.net> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180629131824.25248-1-dirk@gouders.net> References: <20180629120852.20416-1-dirk@gouders.net> <20180629131824.25248-1-dirk@gouders.net> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Motivation for this commit was the problem that xfwrite() uses assert() to ensure it does not operate on empty strings. This caused aborts when the dependency for an empty default string was printed. A possibility to fix this issue would be to print all string constants in quotes which has the positive effect that empty strings have a length of 2 and do not trigger aborts. But currently, constant symbols are typeless, so this patch implements a fix by identifying all constant symbols by the symbol flag SYMBOL_CONST and printing their names within quotes. Note: The symbols y, m and n are statically defined as constants in symbol.c but still printed without quotes. Kconfig files contain a mixture of those symbols specified within and without quotes and we cannot reproduce that after parsing, so we keep the known behaviour. Further, the kconfig language allows for (semantically meant) constant string, int and hex symbols to be specified within quotes or without, which is OK as long as there is no other symbol that is something other than the constant symbol was meant to be; the following Kconfig file tries to illustrate this: config a int "Meant to have default 5..." default 5 config 5 int "but this symbol plays games." default "7" This implementation reproduces exactly the described mixture from the Kconfig files, thus original data. Signed-off-by: Dirk Gouders --- scripts/kconfig/expr.c | 60 +++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c index e1a39e90841d..b5424aca140c 100644 --- a/scripts/kconfig/expr.c +++ b/scripts/kconfig/expr.c @@ -1137,6 +1137,27 @@ static int expr_compare_type(enum expr_type t1, enum expr_type t2) return 0; } +static void sym_print_name(void (*fn)(void *, struct symbol *, const char *), + void *data, struct symbol *sym) { + const char *quoted; + + if (sym->name) + if (!(sym->flags & SYMBOL_CONST) || + sym == &symbol_yes || + sym == &symbol_mod || + sym == &symbol_no) + fn(data, sym, sym->name); + else { + /* + * Print constant symbols within quotes + */ + quoted = sym_escape_string_value(sym->name); + fn(data, sym, quoted); + free((void*)quoted); + } + else + fn(data, NULL, ""); +} void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken) @@ -1150,48 +1171,33 @@ void expr_print(struct expr *e, fn(data, NULL, "("); switch (e->type) { case E_SYMBOL: - if (e->left.sym->name) - fn(data, e->left.sym, e->left.sym->name); - else - fn(data, NULL, ""); + sym_print_name(fn, data, e->left.sym); break; case E_NOT: fn(data, NULL, "!"); expr_print(e->left.expr, fn, data, E_NOT); break; case E_EQUAL: - if (e->left.sym->name) - fn(data, e->left.sym, e->left.sym->name); - else - fn(data, NULL, ""); + sym_print_name(fn, data, e->left.sym); fn(data, NULL, "="); - fn(data, e->right.sym, e->right.sym->name); + sym_print_name(fn, data, e->right.sym); break; case E_LEQ: case E_LTH: - if (e->left.sym->name) - fn(data, e->left.sym, e->left.sym->name); - else - fn(data, NULL, ""); + sym_print_name(fn, data, e->left.sym); fn(data, NULL, e->type == E_LEQ ? "<=" : "<"); - fn(data, e->right.sym, e->right.sym->name); + sym_print_name(fn, data, e->right.sym); break; case E_GEQ: case E_GTH: - if (e->left.sym->name) - fn(data, e->left.sym, e->left.sym->name); - else - fn(data, NULL, ""); + sym_print_name(fn, data, e->left.sym); fn(data, NULL, e->type == E_GEQ ? ">=" : ">"); - fn(data, e->right.sym, e->right.sym->name); + sym_print_name(fn, data, e->right.sym); break; case E_UNEQUAL: - if (e->left.sym->name) - fn(data, e->left.sym, e->left.sym->name); - else - fn(data, NULL, ""); + sym_print_name(fn, data, e->left.sym); fn(data, NULL, "!="); - fn(data, e->right.sym, e->right.sym->name); + sym_print_name(fn, data, e->right.sym); break; case E_OR: expr_print(e->left.expr, fn, data, E_OR); @@ -1204,7 +1210,7 @@ void expr_print(struct expr *e, expr_print(e->right.expr, fn, data, E_AND); break; case E_LIST: - fn(data, e->right.sym, e->right.sym->name); + sym_print_name(fn, data, e->right.sym); if (e->left.expr) { fn(data, NULL, " ^ "); expr_print(e->left.expr, fn, data, E_LIST); @@ -1212,9 +1218,9 @@ void expr_print(struct expr *e, break; case E_RANGE: fn(data, NULL, "["); - fn(data, e->left.sym, e->left.sym->name); + sym_print_name(fn, data, e->left.sym); fn(data, NULL, " "); - fn(data, e->right.sym, e->right.sym->name); + sym_print_name(fn, data, e->right.sym); fn(data, NULL, "]"); break; default: