common: add run_command2 for running simple or hush commands

Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/common/hush.c b/common/hush.c
index 85a603071f15835258341594e26200d6f3d329a1..940889b89864b7adbbfe1bd3e6803a423c6e43d0 100644 (file)
--- a/common/hush.c
+++ b/common/hush.c
@@ -3217,7 +3217,7 @@ int parse_stream_outer(struct in_str *inp, int flag)
 #ifndef __U_BOOT__
 static int parse_string_outer(const char *s, int flag)
 #else
-int parse_string_outer(char *s, int flag)
+int parse_string_outer(const char *s, int flag)
 #endif /* __U_BOOT__ */
 {
        struct in_str input;

diff --git a/common/main.c b/common/main.c
index b97d89e5899ce93e32a63a0a9bb546f5b9a08dc2..3adadfdaa0d6323b13d6a4ca1cb26ccd1a186b29 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -83,8 +83,7 @@ extern void mdm_init(void); /* defined in board.c */
 
 /***************************************************************************
  * Watch for 'delay' seconds for autoboot stop or autoboot delay string.
- * returns: 0 -  no key string, allow autoboot
- *          1 - got key string, abort
+ * returns: 0 -  no key string, allow autoboot 1 - got key string, abort
  */
 #if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
 # if defined(CONFIG_AUTOBOOT_KEYED)
@@ -266,6 +265,26 @@ int abortboot(int bootdelay)
 # endif        /* CONFIG_AUTOBOOT_KEYED */
 #endif /* CONFIG_BOOTDELAY >= 0  */
 
+/*
+ * Return 0 on success, or != 0 on error.
+ */
+static inline
+int run_command2(const char *cmd, int flag)
+{
+#ifndef CONFIG_SYS_HUSH_PARSER
+       /*
+        * run_command can return 0 or 1 for success, so clean up its result.
+        */
+       if (run_command(cmd, flag) == -1)
+               return 1;
+
+       return 0;
+#else
+       return parse_string_outer(cmd,
+                       FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP);
+#endif
+}
+
 /****************************************************************************/
 
 void main_loop (void)
@@ -332,12 +351,7 @@ void main_loop (void)
                int prev = disable_ctrlc(1);    /* disable Control C checking */
 # endif
 
-# ifndef CONFIG_SYS_HUSH_PARSER
-               run_command (p, 0);
-# else
-               parse_string_outer(p, FLAG_PARSE_SEMICOLON |
-                                   FLAG_EXIT_FROM_LOOP);
-# endif
+               run_command2(p, 0);
 
 # ifdef CONFIG_AUTOBOOT_KEYED
                disable_ctrlc(prev);    /* restore Control C checking */
@@ -382,12 +396,7 @@ void main_loop (void)
                int prev = disable_ctrlc(1);    /* disable Control C checking */
 # endif
 
-# ifndef CONFIG_SYS_HUSH_PARSER
-               run_command (s, 0);
-# else
-               parse_string_outer(s, FLAG_PARSE_SEMICOLON |
-                                   FLAG_EXIT_FROM_LOOP);
-# endif
+               run_command2(s, 0);
 
 # ifdef CONFIG_AUTOBOOT_KEYED
                disable_ctrlc(prev);    /* restore Control C checking */
@@ -397,14 +406,8 @@ void main_loop (void)
 # ifdef CONFIG_MENUKEY
        if (menukey == CONFIG_MENUKEY) {
                s = getenv("menucmd");
-               if (s) {
-# ifndef CONFIG_SYS_HUSH_PARSER
-                       run_command(s, 0);
-# else
-                       parse_string_outer(s, FLAG_PARSE_SEMICOLON |
-                                               FLAG_EXIT_FROM_LOOP);
-# endif
-               }
+               if (s)
+                       run_command2(s, 0);
        }
 #endif /* CONFIG_MENUKEY */
 #endif /* CONFIG_BOOTDELAY */
@@ -1403,14 +1406,9 @@ int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
                        printf ("## Error: \"%s\" not defined\n", argv[i]);
                        return 1;
                }
-#ifndef CONFIG_SYS_HUSH_PARSER
-               if (run_command (arg, flag) == -1)
-                       return 1;
-#else
-               if (parse_string_outer(arg,
-                   FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP) != 0)
+
+               if (run_command2(arg, flag) != 0)
                        return 1;
-#endif
        }
        return 0;
 }

diff --git a/include/hush.h b/include/hush.h
index 5c566cc8da65c50e534623c5458a27b7185c4755..ecf9222d27f5674d42cfb6df825f328a1b10dfc0 100644 (file)
--- a/include/hush.h
+++ b/include/hush.h
@@ -29,7 +29,7 @@
 #define FLAG_REPARSING       (1 << 2)    /* >=2nd pass */
 
 extern int u_boot_hush_start(void);
-extern int parse_string_outer(char *, int);
+extern int parse_string_outer(const char *, int);
 extern int parse_file_outer(void);
 
 int set_local_var(const char *s, int flg_export);