Merge branch 'busybox' into merge

1 files changed, 7 insertions, 5 deletions

diff --git a/shell/hush.c b/shell/hush.c
index 5eb6fa396..144ad3edd 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -127,11 +127,6 @@
 //config:       help
 //config:       Enable {abc,def} extension.
 //config:
-//config:config HUSH_LINENO_VAR
-//config:       bool "$LINENO variable"
-//config:       default y
-//config:       depends on HUSH_BASH_COMPAT
-//config:
 //config:config HUSH_BASH_SOURCE_CURDIR
 //config:       bool "'source' and '.' builtins search current directory after $PATH"
 //config:       default n   # do not encourage non-standard behavior
@@ -139,6 +134,11 @@
 //config:       help
 //config:       This is not compliant with standards. Avoid if possible.
 //config:
+//config:config HUSH_LINENO_VAR
+//config:       bool "$LINENO variable (bashism)"
+//config:       default y
+//config:       depends on SHELL_HUSH
+//config:
 //config:config HUSH_INTERACTIVE
 //config:       bool "Interactive mode"
 //config:       default y
@@ -2670,6 +2670,8 @@ static int get_user_input(struct in_str *i)
         }
         if (r < 0) {
                 /* EOF/error detected */
+                /* ^D on interactive input goes to next line before exiting: */
+                write(STDOUT_FILENO, "\n", 1);
                 i->p = NULL;
                 i->peek_buf[0] = r = EOF;
                 return r;