diff mbox

[U-Boot,V3,05/12] cmd_test: check for binary operators before unary

Message ID 1390855802-17504-5-git-send-email-swarren@wwwdotorg.org
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Stephen Warren Jan. 27, 2014, 8:49 p.m. UTC 
From: Stephen Warren <swarren@nvidia.com>

This better mirrors the behaviour of bash, for example:

$ if test -z = -z; then echo yes; else echo no; fi
yes

This is parsed as a string comparison of "-z" and "-z", since the check
for the binary "=" operator occurs first. Without this change, the
command would be parsed as a -z test of "-", followed by a syntax error;
a trailing -z without and operand.

This is a behavioural change, but I believe any commands affected were
previously invalid or bizarely formed.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
v3: New patch.
---
 common/cmd_test.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/common/cmd_test.c b/common/cmd_test.c
index 69b1b4cee69a..e65dd531877e 100644
--- a/common/cmd_test.c
+++ b/common/cmd_test.c
@@ -39,10 +39,6 @@  const struct {
 	int op;
 	int adv;
 } op_adv[] = {
-	{0, "-o", OP_OR, 1},
-	{0, "-a", OP_AND, 1},
-	{0, "-z", OP_STR_EMPTY, 2},
-	{0, "-n", OP_STR_NEMPTY, 2},
 	{1, "=", OP_STR_EQ, 3},
 	{1, "!=", OP_STR_NEQ, 3},
 	{1, "<", OP_STR_LT, 3},
@@ -53,6 +49,10 @@  const struct {
 	{1, "-le", OP_INT_LE, 3},
 	{1, "-gt", OP_INT_GT, 3},
 	{1, "-ge", OP_INT_GE, 3},
+	{0, "-o", OP_OR, 1},
+	{0, "-a", OP_AND, 1},
+	{0, "-z", OP_STR_EMPTY, 2},
+	{0, "-n", OP_STR_NEMPTY, 2},
 };
 
 static int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])