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

hush: fix prompt in multi-line $(())

Browse Source 
Now shows PS2 in this case:

/path/to/dir $ a=b; echo $((
> _

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2018-04-07 17:01:31 +02:00
parent 17058a06c4
commit 8d6eab3225
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
shell/hush.c
View File

@@ -440,6 +440,7 @@
#define debug_printf_redir(...) do {} while (0) #define debug_printf_redir(...) do {} while (0)
#define debug_printf_list(...) do {} while (0) #define debug_printf_list(...) do {} while (0)
#define debug_printf_subst(...) do {} while (0) #define debug_printf_subst(...) do {} while (0)
#define debug_printf_prompt(...) do {} while (0)
#define debug_printf_clean(...) do {} while (0) #define debug_printf_clean(...) do {} while (0)
#define ERR_PTR ((void*)(long)1) #define ERR_PTR ((void*)(long)1)
@@ -551,9 +552,6 @@ static const char *const assignment_flag[] = {
typedef struct in_str { typedef struct in_str {
const char *p; const char *p;
#if ENABLE_HUSH_INTERACTIVE
smallint promptmode; /* 0: PS1, 1: PS2 */
#endif
int peek_buf[2]; int peek_buf[2];
int last_char; int last_char;
FILE *file; FILE *file;
@@ -875,6 +873,9 @@ struct globals {
# define G_x_mode (G.o_opt[OPT_O_XTRACE]) # define G_x_mode (G.o_opt[OPT_O_XTRACE])
#else #else
# define G_x_mode 0 # define G_x_mode 0
#endif
#if ENABLE_HUSH_INTERACTIVE
smallint promptmode; /* 0: PS1, 1: PS2 */
#endif #endif
smallint flag_SIGINT; smallint flag_SIGINT;
#if ENABLE_HUSH_LOOPS #if ENABLE_HUSH_LOOPS
@@ -1248,6 +1249,10 @@ static const struct built_in_command bltins2[] = {
# define debug_printf_subst(...) (indent(), fdprintf(2, __VA_ARGS__)) # define debug_printf_subst(...) (indent(), fdprintf(2, __VA_ARGS__))
#endif #endif
#ifndef debug_printf_prompt
# define debug_printf_prompt(...) (indent(), fdprintf(2, __VA_ARGS__))
#endif
#ifndef debug_printf_clean #ifndef debug_printf_clean
# define debug_printf_clean(...) (indent(), fdprintf(2, __VA_ARGS__)) # define debug_printf_clean(...) (indent(), fdprintf(2, __VA_ARGS__))
# define DEBUG_CLEAN 1 # define DEBUG_CLEAN 1
@@ -2470,15 +2475,15 @@ static void cmdedit_update_prompt(void)
G.PS2 = ""; G.PS2 = "";
} }
# endif # endif
static const char *setup_prompt_string(int promptmode) static const char *setup_prompt_string(void)
{ {
const char *prompt_str; const char *prompt_str;
debug_printf("setup_prompt_string %d ", promptmode); debug_printf_prompt("%s promptmode:%d\n", __func__, G.promptmode);
IF_FEATURE_EDITING_FANCY_PROMPT( prompt_str = G.PS2;) IF_FEATURE_EDITING_FANCY_PROMPT( prompt_str = G.PS2;)
IF_NOT_FEATURE_EDITING_FANCY_PROMPT(prompt_str = "> ";) IF_NOT_FEATURE_EDITING_FANCY_PROMPT(prompt_str = "> ";)
if (promptmode == 0) { /* PS1 */ if (G.promptmode == 0) { /* PS1 */
if (!ENABLE_FEATURE_EDITING_FANCY_PROMPT) { if (!ENABLE_FEATURE_EDITING_FANCY_PROMPT) {
/* No fancy prompts supported, (re)generate "CURDIR $ " by hand */ /* No fancy prompts supported, (re)generate "CURDIR $ " by hand */
free((char*)G.PS1); free((char*)G.PS1);
@@ -2497,7 +2502,7 @@ static int get_user_input(struct in_str *i)
int r; int r;
const char *prompt_str; const char *prompt_str;
prompt_str = setup_prompt_string(i->promptmode); prompt_str = setup_prompt_string();
# if ENABLE_FEATURE_EDITING # if ENABLE_FEATURE_EDITING
for (;;) { for (;;) {
reinit_unicode_for_hush(); reinit_unicode_for_hush();
@@ -2567,7 +2572,8 @@ static int fgetc_interactive(struct in_str *i)
if (G_interactive_fd && i->file == stdin) { if (G_interactive_fd && i->file == stdin) {
/* Returns first char (or EOF), the rest is in i->p[] */ /* Returns first char (or EOF), the rest is in i->p[] */
ch = get_user_input(i); ch = get_user_input(i);
i->promptmode = 1; /* PS2 */ G.promptmode = 1; /* PS2 */
debug_printf_prompt("%s promptmode=%d\n", __func__, G.promptmode);
} else { } else {
/* Not stdin: script file, sourced file, etc */ /* Not stdin: script file, sourced file, etc */
do ch = fgetc(i->file); while (ch == '\0'); do ch = fgetc(i->file); while (ch == '\0');
@@ -2740,7 +2746,6 @@ static int i_peek_and_eat_bkslash_nl(struct in_str *input)
static void setup_file_in_str(struct in_str *i, FILE *f) static void setup_file_in_str(struct in_str *i, FILE *f)
{ {
memset(i, 0, sizeof(*i)); memset(i, 0, sizeof(*i));
/* i->promptmode = 0; - PS1 (memset did it) */
i->file = f; i->file = f;
/* i->p = NULL; */ /* i->p = NULL; */
} }
@@ -2748,7 +2753,6 @@ static void setup_file_in_str(struct in_str *i, FILE *f)
static void setup_string_in_str(struct in_str *i, const char *s) static void setup_string_in_str(struct in_str *i, const char *s)
{ {
memset(i, 0, sizeof(*i)); memset(i, 0, sizeof(*i));
/* i->promptmode = 0; - PS1 (memset did it) */
/*i->file = NULL */; /*i->file = NULL */;
i->p = s; i->p = s;
} }
@@ -4549,6 +4553,9 @@ static int add_till_closing_bracket(o_string *dest, struct in_str *input, unsign
# endif # endif
end_ch &= (DOUBLE_CLOSE_CHAR_FLAG - 1); end_ch &= (DOUBLE_CLOSE_CHAR_FLAG - 1);
G.promptmode = 1; /* PS2 */
debug_printf_prompt("%s promptmode=%d\n", __func__, G.promptmode);
while (1) { while (1) {
ch = i_getch(input); ch = i_getch(input);
if (ch == EOF) { if (ch == EOF) {
@@ -4614,6 +4621,7 @@ static int add_till_closing_bracket(o_string *dest, struct in_str *input, unsign
continue; continue;
} }
} }
debug_printf_parse("%s return '%s' ch:'%c'\n", __func__, dest->data, ch);
return ch; return ch;
} }
#endif /* ENABLE_HUSH_TICK || ENABLE_FEATURE_SH_MATH || ENABLE_HUSH_DOLLAR_OPS */ #endif /* ENABLE_HUSH_TICK || ENABLE_FEATURE_SH_MATH || ENABLE_HUSH_DOLLAR_OPS */
@@ -6670,8 +6678,10 @@ static void parse_and_run_stream(struct in_str *inp, int end_trigger)
struct pipe *pipe_list; struct pipe *pipe_list;
#if ENABLE_HUSH_INTERACTIVE #if ENABLE_HUSH_INTERACTIVE
if (end_trigger == ';') if (end_trigger == ';') {
inp->promptmode = 0; /* PS1 */ G.promptmode = 0; /* PS1 */
debug_printf_prompt("%s promptmode=%d\n", __func__, G.promptmode);
}
#endif #endif
pipe_list = parse_stream(NULL, inp, end_trigger); pipe_list = parse_stream(NULL, inp, end_trigger);
if (!pipe_list || pipe_list == ERR_PTR) { /* EOF/error */ if (!pipe_list || pipe_list == ERR_PTR) { /* EOF/error */