From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 04 Jul 2023 00:59:56 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qGSWT-00E5wH-5B for lore@lore.pengutronix.de; Tue, 04 Jul 2023 00:59:55 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGSWQ-0000Gc-H0 for lore@pengutronix.de; Tue, 04 Jul 2023 00:59:55 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ickdBIqz6BLZEKZsPDIawTZ+GggzyqaBIXxU50mYiK0=; b=0ZOF5LBJFa3Edp7vWK22DADS2K b4HFE5xGRGF91HOv62R9o1DXRFEzTdMlSJlwy37tIEWeqvD2eQtNwSBDEXg6pIwZqMt09+650F51m ADm+nkbEUq8Sdt8eMcL2qRtjv/tp9Kwqw03n5+SSZI5qN5hKzqZuOHV6/9u3JZZtwaZJm4TF0mJe4 s2lA2eEiy1SfBNcvZVq7yDA4TK9C0gRiX05jABqZxLVr/bizry8G9CwpnfeNcavq/iMws70KcGPZY O3O2QobqBl0VwmAuBe764Mc0K97IOABfdPKe3UuWTWk7L651xfMMSGFzkWI9Or9RAu2sGXXhm9pge 7bBNyp4w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qGSV2-00BbAY-1c; Mon, 03 Jul 2023 22:58:28 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qGSUy-00Bb9X-0b for barebox@lists.infradead.org; Mon, 03 Jul 2023 22:58:25 +0000 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qGSUs-0000B5-Ms for barebox@lists.infradead.org; Tue, 04 Jul 2023 00:58:18 +0200 From: Marco Felsch To: barebox@lists.infradead.org Date: Tue, 4 Jul 2023 00:58:13 +0200 Message-Id: <20230703225813.2828815-2-m.felsch@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230703225813.2828815-1-m.felsch@pengutronix.de> References: <20230703225813.2828815-1-m.felsch@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230703_155824_240706_90FDB601 X-CRM114-Status: GOOD ( 14.24 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 2/2] commands: test: add based support for bash-test style X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) Add [[ expression ]] support which allow pattern matching like: - [[ "foo1" == "foo*" ]] - [[ "foo" != "bar" ]] Signed-off-by: Marco Felsch --- commands/Kconfig | 13 +++++++++++++ commands/test.c | 39 ++++++++++++++++++++++++++++++++++----- 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/commands/Kconfig b/commands/Kconfig index 4d3ff631a8..615e96aa9d 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -1219,6 +1219,19 @@ config CMD_TEST !, =, !=, -eq, -ne, -ge, -gt, -le, -lt, -o, -a, -z, -n, -d, -e, -f, -L; see 'man test' on your PC for more information. +if CMD_TEST + +config CMD_TEST_BASH_COMP + tristate + select CONFIG_FNMATCH + prompt "test bash-compatibility" + help + Enable minimal support for bash compatible tests: [[ ]] to allow + pattern matching via: == and != + +# end CMD_TEST +endif + config CMD_TRUE tristate default y diff --git a/commands/test.c b/commands/test.c index c1b84c42ef..77e15aeb03 100644 --- a/commands/test.c +++ b/commands/test.c @@ -11,9 +11,13 @@ #include #include #include +#ifdef CONFIG_CMD_TEST_BASH_COMP +#include +#endif typedef enum { OPT_EQUAL, + OPT_EQUAL_BASH, OPT_NOT_EQUAL, OPT_ARITH_EQUAL, OPT_ARITH_NOT_EQUAL, @@ -36,6 +40,7 @@ typedef enum { static char *test_options[] = { [OPT_EQUAL] = "=", + [OPT_EQUAL_BASH] = "==", [OPT_NOT_EQUAL] = "!=", [OPT_ARITH_EQUAL] = "-eq", [OPT_ARITH_NOT_EQUAL] = "-ne", @@ -67,18 +72,37 @@ static int parse_opt(const char *opt) return -1; } +static int string_comp(const char *left_op, const char *right_op, bool bash_test) +{ +#ifdef CONFIG_CMD_TEST_BASH_COMP + if (bash_test) + return fnmatch(right_op, left_op, 0); +#endif + return strcmp(left_op, right_op); +} + static int do_test(int argc, char *argv[]) { char **ap; int left, adv, expr, last_expr, neg, last_cmp, opt, zero; ulong a, b; struct stat statbuf; + bool bash_test = false; if (*argv[0] == '[') { argc--; - if (*argv[argc] != ']') { - printf("[: missing `]'\n"); - return 1; + if (!strncmp(argv[0], "[[", 2)) { + if (strncmp(argv[argc], "]]", 2) != 0) { + printf("[[: missing `]]'\n"); + return 1; + } + if (IS_ENABLED(CONFIG_CMD_TEST_BASH_COMP)) + bash_test = true; + } else { + if (*argv[argc] != ']') { + printf("[: missing `]'\n"); + return 1; + } } } @@ -183,10 +207,11 @@ static int do_test(int argc, char *argv[]) b = simple_strtol(ap[2], NULL, 0); switch (parse_opt(ap[1])) { case OPT_EQUAL: - expr = strcmp(ap[0], ap[2]) == 0; + case OPT_EQUAL_BASH: + expr = string_comp(ap[0], ap[2], bash_test) == 0; break; case OPT_NOT_EQUAL: - expr = strcmp(ap[0], ap[2]) != 0; + expr = string_comp(ap[0], ap[2], bash_test) != 0; break; case OPT_ARITH_EQUAL: expr = a == b; @@ -233,7 +258,11 @@ static int do_test(int argc, char *argv[]) return expr; } +#ifdef CONFIG_CMD_TEST_BASH_COMP +static const char * const test_aliases[] = { "[", "[[", NULL}; +#else static const char * const test_aliases[] = { "[", NULL}; +#endif BAREBOX_CMD_HELP_START(test) BAREBOX_CMD_HELP_TEXT("Options:") -- 2.39.2