From patchwork Sat Nov 18 07:59:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 166465 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp1047830vqn; Fri, 17 Nov 2023 23:59:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IEyhQfHGviSkqxI0DNG+6O8IHM4q5jH8DF3tHZ8+J6rq2HnP0KjBI/sGsD+bxKqiJumU9yr X-Received: by 2002:a05:6808:1a09:b0:3b2:ef9c:d1b1 with SMTP id bk9-20020a0568081a0900b003b2ef9cd1b1mr2460208oib.6.1700294374569; Fri, 17 Nov 2023 23:59:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700294374; cv=none; d=google.com; s=arc-20160816; b=Yo7Hib2mnapw9qaEHyufe8t3g09jMF3Nqgcbv2CEoLIE1a+mdNRhbVTxdYdWNrJxcS jM3rlMoYkormxy8RaDfvvDcvUUCNGSHCh54ruKuHAw4pczcHzpLSimlTV7H5OwODT3dP oOBv0K+L0XrDrKjGwjjNlPMzYpoBIvpkHaH3RI8PmdozC3ddlOQl66YYfPy6sJq2FUGi qTaiMM13fs8FHzJTPAUIr+olh96NsGLCjFWnwUjmix8MrZY+hx/yKtL9vI/fBt+2faCb cQvCOmUUihqFW30yui6GLXlepOvVOJXSRREdbMWo0oAfUwWQZZtlYf1I6Pynv+N8KAEb s0KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5+LpRcHVwgj6rons9UxyT53hN+X3c+pujXkWcR8deQ0=; fh=oQbvuNnOUeIuBT5siQdg+euUHNNdn+CeEwAg69/1RSo=; b=03YZvfz8ZY1cnlJEQfFaWvWYlAc11VQS9OLVXfiJG8jhTUsiLxzjt8xICJV1ukNdjZ Uzevl9sMxtGSHiySLJZpCC5nad9pG2jX6k9C2HFvq0Y+NRCVJLtTCsppoqgvo2hN9SUG 10BvirLaDPeZsuVNxNJO1HxP5CgFB26pkEAdhLG770q+Cth5t5ILoCn7mkSnSW4+lt0Y C70CCM1+EqBdTF3CrOKMQhswj3NM7P99TCx9doXNrWLxZK4VqqR0r0XkZ7QsxgoDdk+L LJBWWLdpkIeHA+bpOdMTuleufT2OFgQh5jWYkwWP+jvTfXmcrzPqZfN9KpQC4L2e9jbM 6a+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nKXRv4Zt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id a12-20020a63e84c000000b005bd3da15474si3643111pgk.839.2023.11.17.23.59.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 23:59:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nKXRv4Zt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id C7A4982AE2C1; Fri, 17 Nov 2023 23:59:33 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232760AbjKRH72 (ORCPT + 29 others); Sat, 18 Nov 2023 02:59:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232422AbjKRH7X (ORCPT ); Sat, 18 Nov 2023 02:59:23 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D628D5C for ; Fri, 17 Nov 2023 23:59:20 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F603C433CA; Sat, 18 Nov 2023 07:59:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700294359; bh=7B9xzLj7sIaqmkQ1H5s+m9dY9DubmYm9c00xpE/4MPg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nKXRv4Zt8qe0WCMduKIxPCC67/0jUCspqh1jRXrxruCDwXj1rPlOzGpHrKK393xgV XTbNFN58g73dfeBmmoTv6FNn7csho25HIDWOeOi+JgP0pMzHqk7ConchAkFCgfuGjs HHJw1tmEiM3RHF2DXXudpFiZzd2Vm61Nx++tNS7T/B1EbekHZ0OQOzgdQE3CPJt36k xNkz32DDAi0EsbjFpix58JEKrDgUaMT0DPKBDoTxSwUS4eP2pt0kHq6H6PM9OVNoqm dYGidN2bS39UrtgQq10pWPvs5mXvAKFXRouaC0ZZVjMZiNiqYLGBS6YdKI+eOcrC+U zhRh0mjghKVPw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH 4/6] kconfig: introduce getline_stripped() helper Date: Sat, 18 Nov 2023 16:59:10 +0900 Message-Id: <20231118075912.1303509-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231118075912.1303509-1-masahiroy@kernel.org> References: <20231118075912.1303509-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 17 Nov 2023 23:59:33 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782887874244737647 X-GMAIL-MSGID: 1782887874244737647 Currently, newline characters are stripped away in multiple places on the caller. Doing that in the callee is helpful for further cleanups. Signed-off-by: Masahiro Yamada --- scripts/kconfig/confdata.c | 40 +++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index b6a90f6baea1..795ac6c9378f 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -337,12 +337,32 @@ static ssize_t compat_getline(char **lineptr, size_t *n, FILE *stream) return -1; } +/* like getline(), but the newline character is stripped away */ +static ssize_t getline_stripped(char **lineptr, size_t *n, FILE *stream) +{ + ssize_t len; + + len = compat_getline(lineptr, n, stream); + + if (len > 0 && (*lineptr)[len - 1] == '\n') { + len--; + (*lineptr)[len] = '\0'; + + if (len > 0 && (*lineptr)[len - 1] == '\r') { + len--; + (*lineptr)[len] = '\0'; + } + } + + return len; +} + int conf_read_simple(const char *name, int def) { FILE *in = NULL; char *line = NULL; size_t line_asize = 0; - char *p, *p2, *val; + char *p, *val; struct symbol *sym; int i, def_flags; const char *warn_unknown, *werror, *sym_name; @@ -421,7 +441,7 @@ int conf_read_simple(const char *name, int def) } } - while (compat_getline(&line, &line_asize, in) != -1) { + while (getline_stripped(&line, &line_asize, in) != -1) { conf_lineno++; if (line[0] == '#') { if (line[1] != ' ') @@ -443,19 +463,11 @@ int conf_read_simple(const char *name, int def) p = strchr(sym_name, '='); if (!p) continue; - *p++ = 0; - val = p; - p2 = strchr(p, '\n'); - if (p2) { - *p2-- = 0; - if (*p2 == '\r') - *p2 = 0; - } + *p = 0; + val = p + 1; } else { - if (line[0] != '\r' && line[0] != '\n') - conf_warning("unexpected data: %.*s", - (int)strcspn(line, "\r\n"), line); - + if (line[0] != '\0') + conf_warning("unexpected data: %s", line); continue; }