Merge branch 'u-boot/master'

[karo-tx-uboot.git] / common / cmd_itest.c

diff --git a/common/cmd_itest.c b/common/cmd_itest.c
index 8dd8927b5803028111428eff00aafbb4b1b06260..ae2527bfecdb8e2d55ad211bf6de6715a922f752 100644 (file)
--- a/common/cmd_itest.c
+++ b/common/cmd_itest.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2003
  * Tait Electronics Limited, Christchurch, New Zealand
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -46,7 +30,7 @@ struct op_tbl_s {
 
 typedef struct op_tbl_s op_tbl_t;
 
-op_tbl_t op_table [] = {
+static const op_tbl_t op_table [] = {
        { "-lt", LT },
        { "<"  , LT },
        { "-gt", GT },
@@ -62,8 +46,6 @@ op_tbl_t op_table [] = {
        { "<=" , LE },
 };
 
-#define op_tbl_size (sizeof(op_table)/sizeof(op_table[0]))
-
 static long evalexp(char *s, int w)
 {
        long l = 0;
@@ -89,6 +71,19 @@ static char * evalstr(char *s)
        /* if the parameter starts with a * then assume a string pointer else its a literal */
        if (s[0] == '*') {
                return (char *)simple_strtoul(&s[1], NULL, 16);
+       } else if (s[0] == '$') {
+               int i = 2;
+
+               if (s[1] != '{')
+                       return NULL;
+
+               while (s[i] != '}') {
+                       if (s[i] == 0)
+                               return NULL;
+                       i++;
+               }
+               s[i] = 0;
+               return  getenv((const char *)&s[2]);
        } else {
                return s;
        }
@@ -96,16 +91,13 @@ static char * evalstr(char *s)
 
 static int stringcomp(char *s, char *t, int op)
 {
-       int n, p;
+       int p;
        char *l, *r;
 
        l = evalstr(s);
        r = evalstr(t);
 
-       /* we'll do a compare based on the length of the shortest string */
-       n = min(strlen(l), strlen(r));
-
-       p = strncmp(l, r, n);
+       p = strcmp(l, r);
        switch (op) {
        case EQ: return (p == 0);
        case NE: return (p != 0);
@@ -135,15 +127,15 @@ static int arithcomp (char *s, char *t, int op, int w)
        return (0);
 }
 
-int binary_test (char *op, char *arg1, char *arg2, int w)
+static int binary_test(char *op, char *arg1, char *arg2, int w)
 {
        int len, i;
-       op_tbl_t *optp;
+       const op_tbl_t *optp;
 
        len = strlen(op);
 
        for (optp = (op_tbl_t *)&op_table, i = 0;
-            i < op_tbl_size;
+            i < ARRAY_SIZE(op_table);
             optp++, i++) {
 
                if ((strncmp (op, optp->op, len) == 0) && (len == strlen (optp->op))) {
@@ -160,13 +152,13 @@ int binary_test (char *op, char *arg1, char *arg2, int w)
 }
 
 /* command line interface to the shell test */
-int do_itest ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] )
+static int do_itest(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int     value, w;
 
        /* Validate arguments */
        if ((argc != 4))
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        /* Check for a data width specification.
         * Defaults to long (4) if no specification.