diff options
Diffstat (limited to 'shell/hush.c')
-rw-r--r-- | shell/hush.c | 12 |
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 @@ | |||
127 | //config: help | 127 | //config: help |
128 | //config: Enable {abc,def} extension. | 128 | //config: Enable {abc,def} extension. |
129 | //config: | 129 | //config: |
130 | //config:config HUSH_LINENO_VAR | ||
131 | //config: bool "$LINENO variable" | ||
132 | //config: default y | ||
133 | //config: depends on HUSH_BASH_COMPAT | ||
134 | //config: | ||
135 | //config:config HUSH_BASH_SOURCE_CURDIR | 130 | //config:config HUSH_BASH_SOURCE_CURDIR |
136 | //config: bool "'source' and '.' builtins search current directory after $PATH" | 131 | //config: bool "'source' and '.' builtins search current directory after $PATH" |
137 | //config: default n # do not encourage non-standard behavior | 132 | //config: default n # do not encourage non-standard behavior |
@@ -139,6 +134,11 @@ | |||
139 | //config: help | 134 | //config: help |
140 | //config: This is not compliant with standards. Avoid if possible. | 135 | //config: This is not compliant with standards. Avoid if possible. |
141 | //config: | 136 | //config: |
137 | //config:config HUSH_LINENO_VAR | ||
138 | //config: bool "$LINENO variable (bashism)" | ||
139 | //config: default y | ||
140 | //config: depends on SHELL_HUSH | ||
141 | //config: | ||
142 | //config:config HUSH_INTERACTIVE | 142 | //config:config HUSH_INTERACTIVE |
143 | //config: bool "Interactive mode" | 143 | //config: bool "Interactive mode" |
144 | //config: default y | 144 | //config: default y |
@@ -2670,6 +2670,8 @@ static int get_user_input(struct in_str *i) | |||
2670 | } | 2670 | } |
2671 | if (r < 0) { | 2671 | if (r < 0) { |
2672 | /* EOF/error detected */ | 2672 | /* EOF/error detected */ |
2673 | /* ^D on interactive input goes to next line before exiting: */ | ||
2674 | write(STDOUT_FILENO, "\n", 1); | ||
2673 | i->p = NULL; | 2675 | i->p = NULL; |
2674 | i->peek_buf[0] = r = EOF; | 2676 | i->peek_buf[0] = r = EOF; |
2675 | return r; | 2677 | return r; |