Merge branch 'busybox' into merge

2 files changed, 5 insertions, 7 deletions

diff --git a/shell/ash.c b/shell/ash.c
index b34ed67a7..28c7fe2db 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -10611,7 +10611,7 @@ evalpipe(union node *n, int flags)
 }
 
 /* setinteractive needs this forward reference */
-#if EDITING_HAS_get_exe_name
+#if ENABLE_FEATURE_EDITING
 static const char *get_builtin_name(int i) FAST_FUNC;
 #endif
 
@@ -10648,9 +10648,8 @@ setinteractive(int on)
 #if ENABLE_FEATURE_EDITING
                 if (!line_input_state) {
                         line_input_state = new_line_input_t(FOR_SHELL | WITH_PATH_LOOKUP);
-# if EDITING_HAS_get_exe_name
                         line_input_state->get_exe_name = get_builtin_name;
-# endif
+                        line_input_state->sh_get_var = lookupvar;
                 }
 #endif
         }
@@ -11157,7 +11156,7 @@ find_builtin(const char *name)
         return bp;
 }
 
-#if EDITING_HAS_get_exe_name
+#if ENABLE_FEATURE_EDITING
 static const char * FAST_FUNC
 get_builtin_name(int i)
 {
diff --git a/shell/hush.c b/shell/hush.c
index ae81f0da5..051b123e7 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -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 && EDITING_HAS_get_exe_name
+#if ENABLE_HUSH_JOB && ENABLE_FEATURE_EDITING
 static const char * FAST_FUNC get_builtin_name(int i)
 {
         if (/*i >= 0 && */ i < ARRAY_SIZE(bltins1)) {
@@ -10668,9 +10668,8 @@ int hush_main(int argc, char **argv)
 
 # if ENABLE_FEATURE_EDITING
                 G.line_input_state = new_line_input_t(FOR_SHELL);
-#  if EDITING_HAS_get_exe_name
                 G.line_input_state->get_exe_name = get_builtin_name;
-#  endif
+                G.line_input_state->sh_get_var = get_local_var_value;
 # endif
 # if ENABLE_HUSH_SAVEHISTORY && MAX_HISTORY > 0
                 {