X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=common%2Fcmd_test.c;h=c93fe78231000e1ad1f28fa8dec560e35f8161ea;hb=1ad6364eeb4f578e423081d1748e8a3fdf1ab01d;hp=e65dd531877eaa57b343b9a1a5863f108fcd450b;hpb=4c80f29edd33cc613d01c5e93dde380b98d3c20c;p=platform%2Fkernel%2Fu-boot.git

diff --git a/common/cmd_test.c b/common/cmd_test.c
index e65dd53..c93fe78 100644
--- a/common/cmd_test.c
+++ b/common/cmd_test.c
@@ -16,8 +16,10 @@
 
 #include <common.h>
 #include <command.h>
+#include <fs.h>
 
 #define OP_INVALID	0
+#define OP_NOT		1
 #define OP_OR		2
 #define OP_AND		3
 #define OP_STR_EMPTY	4
@@ -32,6 +34,7 @@
 #define OP_INT_LE	13
 #define OP_INT_GT	14
 #define OP_INT_GE	15
+#define OP_FILE_EXISTS	16
 
 const struct {
 	int arg;
@@ -49,16 +52,18 @@ const struct {
 	{1, "-le", OP_INT_LE, 3},
 	{1, "-gt", OP_INT_GT, 3},
 	{1, "-ge", OP_INT_GE, 3},
+	{0, "!", OP_NOT, 1},
 	{0, "-o", OP_OR, 1},
 	{0, "-a", OP_AND, 1},
 	{0, "-z", OP_STR_EMPTY, 2},
 	{0, "-n", OP_STR_NEMPTY, 2},
+	{0, "-e", OP_FILE_EXISTS, 4},
 };
 
 static int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	char * const *ap;
-	int i, op, left, adv, expr, last_expr, neg, last_cmp;
+	int i, op, left, adv, expr, last_expr, last_unop, last_binop;
 
 	/* args? */
 	if (argc < 3)
@@ -73,17 +78,11 @@ static int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	}
 #endif
 
-	last_expr = 0;
-	left = argc - 1; ap = argv + 1;
-	if (left > 0 && strcmp(ap[0], "!") == 0) {
-		neg = 1;
-		ap++;
-		left--;
-	} else
-		neg = 0;
-
-	expr = -1;
-	last_cmp = OP_INVALID;
+	left = argc - 1;
+	ap = argv + 1;
+	expr = 0;
+	last_unop = OP_INVALID;
+	last_binop = OP_INVALID;
 	last_expr = -1;
 	while (left > 0) {
 		for (i = 0; i < ARRAY_SIZE(op_adv); i++) {
@@ -147,32 +146,44 @@ static int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 			expr = simple_strtol(ap[0], NULL, 10) >=
 					simple_strtol(ap[2], NULL, 10);
 			break;
+		case OP_FILE_EXISTS:
+			expr = file_exists(ap[1], ap[2], ap[3], FS_TYPE_ANY);
+			break;
 		}
 
 		switch (op) {
 		case OP_OR:
 			last_expr = expr;
-			last_cmp = OP_OR;
+			last_binop = OP_OR;
 			break;
 		case OP_AND:
 			last_expr = expr;
-			last_cmp = OP_AND;
+			last_binop = OP_AND;
+			break;
+		case OP_NOT:
+			if (last_unop == OP_NOT)
+				last_unop = OP_INVALID;
+			else
+				last_unop = OP_NOT;
 			break;
 		default:
-			if (last_cmp == OP_OR)
+			if (last_unop == OP_NOT) {
+				expr = !expr;
+				last_unop = OP_INVALID;
+			}
+
+			if (last_binop == OP_OR)
 				expr = last_expr || expr;
-			else if (last_cmp == OP_AND)
+			else if (last_binop == OP_AND)
 				expr = last_expr && expr;
-			last_cmp = OP_INVALID;
+			last_binop = OP_INVALID;
+
 			break;
 		}
 
 		ap += adv; left -= adv;
 	}
 
-	if (neg)
-		expr = !expr;
-
 	expr = !expr;
 
 	debug (": returns %d\n", expr);