Rename hush to cli_hush

Hush is a command-line interpreter, so rename it to make that clearer.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index f941e44e833b860933085e67194ac7f57d572548..2ddb3da38f35f7245551bd66ebbffabd71f59420 100644 (file)
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -12,7 +12,7 @@
 #include <ioports.h>
 #include <command.h>
 #include <malloc.h>
-#include <hush.h>
+#include <cli_hush.h>
 #include <net.h>
 #include <netdev.h>
 #include <asm/io.h>

diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c
index f0e91bbdfe4f310aae832f1924f2a7094e20fc95..bffc08be951e0a7c4cdec47f47c8cc48558c0852 100644 (file)
--- a/board/keymile/common/ivm.c
+++ b/board/keymile/common/ivm.c
@@ -6,7 +6,7 @@
  */
 
 #include <common.h>
-#include <hush.h>
+#include <cli_hush.h>
 #include <i2c.h>
 #include "common.h"
 

diff --git a/common/Makefile b/common/Makefile
index 219cb51b2d70c956b11a6666687dfe019d948490..da184a8dc150c1aa40313ee14cae75399b739bab 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -11,7 +11,7 @@ obj-y += main.o
 obj-y += command.o
 obj-y += exports.o
 obj-y += hash.o
-obj-$(CONFIG_SYS_HUSH_PARSER) += hush.o
+obj-$(CONFIG_SYS_HUSH_PARSER) += cli_hush.o
 obj-y += s_record.o
 obj-y += xyzModem.o
 obj-y += cmd_disk.o

diff --git a/common/hush.c b/common/cli_hush.c
similarity index 99%
rename from common/hush.c
rename to common/cli_hush.c
index 5b432247599fc521cc184d7ca0b81c8109ee4f8e..012004aea540bba0a2ed89d164e3befcf9b9ad36 100644 (file)
--- a/common/hush.c
+++ b/common/cli_hush.c
@@ -79,7 +79,7 @@
 #include <malloc.h>         /* malloc, free, realloc*/
 #include <linux/ctype.h>    /* isalpha, isdigit */
 #include <common.h>        /* readline */
-#include <hush.h>
+#include <cli_hush.h>
 #include <command.h>        /* find_cmd */
 #ifndef CONFIG_SYS_PROMPT_HUSH_PS2
 #define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
@@ -222,7 +222,7 @@ struct child_prog {
 #endif
        char **argv;                            /* program name and arguments */
        /* was quoted when parsed; copy of struct o_string.nonnull field */
-       int *argv_nonnull;                      
+       int *argv_nonnull;
 #ifdef __U_BOOT__
        int    argc;                            /* number of program arguments */
 #endif

diff --git a/common/main.c b/common/main.c
index 9bee7bdc6b0e9b8deeb21b15647ff48a8e88156d..a80fb7c3441cda6ef3318dad72cf000126502cdf 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -14,7 +14,7 @@
 #include <common.h>
 #include <command.h>
 #include <fdtdec.h>
-#include <hush.h>
+#include <cli_hush.h>
 #include <malloc.h>
 #include <menu.h>
 #include <post.h>

diff --git a/include/hush.h b/include/cli_hush.h
similarity index 93%
rename from include/hush.h
rename to include/cli_hush.h
index 595303a6521f3acbfdabe4d6ebc3f8878d6e3859..4951eef5724305519038ca739a77c60e087a5fa5 100644 (file)
--- a/include/hush.h
+++ b/include/cli_hush.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#ifndef _HUSH_H_
-#define _HUSH_H_
+#ifndef _CLI_HUSH_H_
+#define _CLI_HUSH_H_
 
 #define FLAG_EXIT_FROM_LOOP 1
 #define FLAG_PARSE_SEMICOLON (1 << 1)    /* symbol ';' is special for parser */