emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell: fix compile failures in some configs

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2023-01-03 08:28:16 +01:00
parent 8ed57db65b
commit 27be0e8cfe
4 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shell/ash.c
View File

@@ -9736,7 +9736,7 @@ evalpipe(union node *n, int flags)
}
/* setinteractive needs this forward reference */
#if ENABLE_FEATURE_EDITING
#if ENABLE_FEATURE_TAB_COMPLETION
static const char *get_builtin_name(int i) FAST_FUNC;
#endif
@@ -9773,8 +9773,12 @@ setinteractive(int on)
#if ENABLE_FEATURE_EDITING
if (!line_input_state) {
line_input_state = new_line_input_t(FOR_SHELL | WITH_PATH_LOOKUP);
# if ENABLE_FEATURE_TAB_COMPLETION
line_input_state->get_exe_name = get_builtin_name;
# endif
# if EDITING_HAS_sh_get_var
line_input_state->sh_get_var = lookupvar;
# endif
}
#endif
}
@@ -10283,7 +10287,7 @@ find_builtin(const char *name)
return bp;
}
#if ENABLE_FEATURE_EDITING
#if ENABLE_FEATURE_TAB_COMPLETION
static const char * FAST_FUNC
get_builtin_name(int i)
{

6
shell/hush.c
View File

@@ -8188,7 +8188,7 @@ static const struct built_in_command *find_builtin(const char *name)
return find_builtin_helper(name, bltins2, &bltins2[ARRAY_SIZE(bltins2)]);
}
#if ENABLE_HUSH_JOB && ENABLE_FEATURE_EDITING
#if ENABLE_HUSH_JOB && ENABLE_FEATURE_TAB_COMPLETION
static const char * FAST_FUNC get_builtin_name(int i)
{
if (/*i >= 0 && */ i < ARRAY_SIZE(bltins1)) {
@@ -10668,8 +10668,12 @@ int hush_main(int argc, char **argv)
# if ENABLE_FEATURE_EDITING
G.line_input_state = new_line_input_t(FOR_SHELL);
# if ENABLE_FEATURE_TAB_COMPLETION
G.line_input_state->get_exe_name = get_builtin_name;
# endif
# if EDITING_HAS_sh_get_var
G.line_input_state->sh_get_var = get_local_var_value;
# endif
# endif
# if ENABLE_HUSH_SAVEHISTORY && MAX_HISTORY > 0
{