diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-04-12 09:21:12 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-04-15 12:21:44 +0200 |
| commit | 4e9f324d37e98823eb7179a239d412e9786d9938 (patch) | |
| tree | dbf48964f86b31bb552c2b821ab597983ae97435 | |
| parent | 086d0026a0eadb40e3c5502042a7c20a0ffa1c4f (diff) | |
| download | barebox-4e9f324d37e98823eb7179a239d412e9786d9938.tar.gz barebox-4e9f324d37e98823eb7179a239d412e9786d9938.tar.xz | |
include: move shell prototypes to shell.h
We have a shell,h, so move shell specific prototypes there.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | common/menutree.c | 1 | ||||
| -rw-r--r-- | common/startup.c | 1 | ||||
| -rw-r--r-- | include/common.h | 11 | ||||
| -rw-r--r-- | include/shell.h | 11 |
4 files changed, 13 insertions, 11 deletions
diff --git a/common/menutree.c b/common/menutree.c index 160ba9ac4b..1505ec8541 100644 --- a/common/menutree.c +++ b/common/menutree.c @@ -16,6 +16,7 @@ #include <glob.h> #include <menu.h> #include <fs.h> +#include <shell.h> #include <libfile.h> #include <linux/stat.h> diff --git a/common/startup.c b/common/startup.c index 093a23ba08..432be67cd6 100644 --- a/common/startup.c +++ b/common/startup.c @@ -30,6 +30,7 @@ * @brief Main entry into the C part of barebox */ #include <common.h> +#include <shell.h> #include <init.h> #include <command.h> #include <malloc.h> diff --git a/include/common.h b/include/common.h index cab98d62d8..ea349beb9a 100644 --- a/include/common.h +++ b/include/common.h @@ -102,17 +102,6 @@ extern int (*barebox_main)(void); void __noreturn start_barebox(void); void shutdown_barebox(void); -int run_shell(void); - -#ifdef CONFIG_SHELL_HUSH -char *shell_expand(char *str); -#else -static inline char *shell_expand(char *str) -{ - return strdup(str); -} -#endif - #define ALIGN_DOWN(x, a) ((x) & ~((typeof(x))(a) - 1)) #define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) diff --git a/include/shell.h b/include/shell.h index b98cac3dc5..65dad0e1d1 100644 --- a/include/shell.h +++ b/include/shell.h @@ -9,4 +9,15 @@ int shell_get_last_return_code(void); +int run_shell(void); + +#ifdef CONFIG_SHELL_HUSH +char *shell_expand(char *str); +#else +static inline char *shell_expand(char *str) +{ + return strdup(str); +} +#endif + #endif /* __SHELL_H__ */ |