libedit support followup
Pablo Neira Ayuso
maintainercover libedit support followup
Hi,
This is a follow up to address a few issues with libedit support:
tests/shell now works fine.
Pablo Neira Ayuso (2):
cli: use plain readline() interface with libedit
main: fix typo in cli definition
src/cli.c | 39 +++++++++++++++++++++++++++++++++++---- src/main.c | 2 +- 2 files changed, 36 insertions(+), 5 deletions(-)
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 1/2 cli: use plain readline() interface with libedit
Instead of the alternate interface [1].
I spent a bit of time debugging an issue with libedit support 9420423900a2 ("cli: add libedit support") that broke tests/shell.
This is the reproducer:
# nft -i << EOF list ruleset EOF
which makes rl_callback_read_char() loop forever on read() as shown by strace. The rl_line_buffer variable does not accumulate the typed characters as it should when redirecting the standard input for some reason.
Given our interactive interface is fairly simple at this stage, switch to use the readline() interface instead of rl_callback_read_char().
[1] https://docs.freebsd.org/info/readline/readline.info.Alternate_Interface.html
--- src/cli.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-)
src/cli.c +35 -4
@@ -154,6 +154,16 @@ static void cli_complete(char *line)free (line); } +void cli_exit (void ) +{ +rl_callback_handler_remove (); +rl_deprep_terminal (); +write_history (histfile); +} +#endif + +#if defined(HAVE_LIBREADLINE ) +static char **cli_completion (const char *text,int start,int end) {return NULL ;
@@ -179,11 +189,32 @@ int cli_init(struct nft_ctx *nft) return 0; } -void cli_exit (void ) +#elif defined(HAVE_LIBEDIT) + +int cli_init (struct nft_ctx *nft) { -rl_callback_handler_remove (); -rl_deprep_terminal (); -write_history (histfile); +char *line; + + cli_nft = nft; + rl_readline_name = (char *)"nft" ; + rl_instream = stdin; + rl_outstream = stdout; + +init_histfile (); + +read_history (histfile); +history_set_pos (history_length); + +rl_set_prompt (CMDLINE_PROMPT ); +while ((line =readline (rl_prompt)) !=NULL ) { + line =cli_append_multiline (line); +if (!line) +continue ; + +cli_complete (line); + } + +return 0 ; }#else /* HAVE_LINENOISE */
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 2/2 main: fix typo in cli definition
In reply to Pablo Neira Ayuso9420423900a2 ("cli: add libedit support") updated HAVE_LIBREADLINE to HAVE_READLINE by mistake.
--- src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/main.c +1 -1
@@ -227,7 +227,7 @@ static void show_version(void) {const char *cli, *minigmp, *json, *xt; -#if defined(HAVE_READLINE ) +#if defined(HAVE_LIBREADLINE ) cli ="readline" ;#elif defined(HAVE_LIBEDIT ) cli ="editline" ;
Signature · 1 line
2.20.1