diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-04-04 10:06:22 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-04-04 10:06:22 +0200 |
| commit | a5c3b05b4d087a22a72b5d979a7539e3c5be2917 (patch) | |
| tree | ea30315e0ffb84770631b9b70b7dc0da7dd3c4f0 /include | |
| parent | 3753efa4271d674d9b3cc77a0e405b38711ac505 (diff) | |
| parent | 294dc7160e55ffb6b940045fb00f01697dacd660 (diff) | |
| download | barebox-a5c3b05b4d087a22a72b5d979a7539e3c5be2917.tar.gz barebox-a5c3b05b4d087a22a72b5d979a7539e3c5be2917.tar.xz | |
Merge branch 'for-next/menutree'
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 9 | ||||
| -rw-r--r-- | include/menu.h | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h index 6987b4f16d..bfd3ce8b7b 100644 --- a/include/common.h +++ b/include/common.h @@ -165,6 +165,15 @@ void arch_shutdown(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 + /* Force a compilation error if condition is true */ #define BUILD_BUG_ON(condition) ((void)BUILD_BUG_ON_ZERO(condition)) diff --git a/include/menu.h b/include/menu.h index f63a405121..8b0ffb1f83 100644 --- a/include/menu.h +++ b/include/menu.h @@ -106,4 +106,6 @@ struct menu_entry* menu_entry_get_by_num(struct menu* m, int num); */ void menu_action_exit(struct menu *m, struct menu_entry *me); +int menutree(const char *path, int toplevel); + #endif /* __MENU_H__ */ |