[PATCH v3 1/2] commands: test: simplify argv handling

[PATCH v3 1/2] commands: test: simplify argv handling

[Marco Felsch]

Decrement argc first before check the closing ']' to avoid the
*argv[argc - 1]. No functional change.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
v3:
- no changes
v2:
- no changes

 commands/test.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/commands/test.c b/commands/test.c
index c845cec017..c1b84c42ef 100644
--- a/commands/test.c
+++ b/commands/test.c
@@ -75,11 +75,11 @@ static int do_test(int argc, char *argv[])
 	struct stat statbuf;
 
 	if (*argv[0] == '[') {
-		if (*argv[argc - 1] != ']') {
+		argc--;
+		if (*argv[argc] != ']') {
 			printf("[: missing `]'\n");
 			return 1;
 		}
-		argc--;
 	}
 
 	/* args? */
-- 
2.39.2

[PATCH v3 2/2] commands: test: add based support for bash-test style

[Marco Felsch]

Add bash-style test [[ expression ]] to support pattern matching like:

  - [[ "foo1" == "foo*" ]]
  - [[ "foo1" != "bar*" ]]

For more information see man 1 bash.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
v3:
 - replace pr_* with printf
v2:
 - drop addittional Kconfig switch
 - fix FNMATCH select
 - drop conditional compilation
 - adapt commit message

 commands/Kconfig |  6 ++++--
 commands/test.c  | 33 +++++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/commands/Kconfig b/commands/Kconfig
index 7ca7b56fa5..17ad5ff87c 100644
--- a/commands/Kconfig
+++ b/commands/Kconfig
@@ -1208,15 +1208,17 @@ config CMD_SLEEP
 config CMD_TEST
 	tristate
 	depends on SHELL_HUSH
+	select FNMATCH
 	default y
 	prompt "test"
 	help
-	  Minimal test command like in /bin/sh
+	  Minimal test command like in /bin/sh with support for bash-style
+	  [[ expression ]] tests as well.
 
 	  Usage: test [EXPR]
 
 	  Options:
-		  !, =, !=, -eq, -ne, -ge, -gt, -le, -lt, -o, -a, -z, -n, -d, -e,
+		  !, =, ==, !=, -eq, -ne, -ge, -gt, -le, -lt, -o, -a, -z, -n, -d, -e,
 		  -f, -L; see 'man test' on your PC for more information.
 
 config CMD_TRUE
diff --git a/commands/test.c b/commands/test.c
index c1b84c42ef..1130bf2e5b 100644
--- a/commands/test.c
+++ b/commands/test.c
@@ -9,11 +9,13 @@
  */
 #include <common.h>
 #include <command.h>
+#include <fnmatch.h>
 #include <fs.h>
 #include <linux/stat.h>
 
 typedef enum {
 	OPT_EQUAL,
+	OPT_EQUAL_BASH,
 	OPT_NOT_EQUAL,
 	OPT_ARITH_EQUAL,
 	OPT_ARITH_NOT_EQUAL,
@@ -36,6 +38,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 +70,35 @@ static int parse_opt(const char *opt)
 	return -1;
 }
 
+static int string_comp(const char *left_op, const char *right_op, bool bash_test)
+{
+	if (bash_test)
+		return fnmatch(right_op, left_op, 0);
+
+	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;
+			}
+			bash_test = true;
+		} else {
+			if (*argv[argc] != ']') {
+				printf("[: missing `]'\n");
+				return 1;
+			}
 		}
 	}
 
@@ -183,10 +203,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 +254,7 @@ static int do_test(int argc, char *argv[])
 	return expr;
 }
 
-static const char * const test_aliases[] = { "[", NULL};
+static const char * const test_aliases[] = { "[", "[[", NULL};
 
 BAREBOX_CMD_HELP_START(test)
 BAREBOX_CMD_HELP_TEXT("Options:")
-- 
2.39.2

Re: [PATCH v3 1/2] commands: test: simplify argv handling

[Sascha Hauer]

On Tue, Jul 04, 2023 at 02:16:25PM +0200, Marco Felsch wrote:
> Decrement argc first before check the closing ']' to avoid the
> *argv[argc - 1]. No functional change.
> 
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> ---
> v3:
> - no changes
> v2:
> - no changes
> 
>  commands/test.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/commands/test.c b/commands/test.c
> index c845cec017..c1b84c42ef 100644
> --- a/commands/test.c
> +++ b/commands/test.c
> @@ -75,11 +75,11 @@ static int do_test(int argc, char *argv[])
>  	struct stat statbuf;
>  
>  	if (*argv[0] == '[') {
> -		if (*argv[argc - 1] != ']') {
> +		argc--;
> +		if (*argv[argc] != ']') {
>  			printf("[: missing `]'\n");
>  			return 1;
>  		}
> -		argc--;
>  	}
>  
>  	/* args? */
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |