From 3e4d73cf00d919422e31037c967371e2563801bc Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 11 Apr 2018 10:21:35 +0200 Subject: cli: Drop String termination workaround This spot was missed by commit 2b3f18e0cf7a7 ("libnftables: Fix for input without trailing newline") - since line termination is now added in nft_run_cmd_from_buffer(), cli is relieved from doing so. Fixes: 2b3f18e0cf7a7 ("libnftables: Fix for input without trailing newline") Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- src/cli.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/cli.c b/src/cli.c index eb60d01d..241ea010 100644 --- a/src/cli.c +++ b/src/cli.c @@ -83,8 +83,6 @@ static void cli_complete(char *line) const HIST_ENTRY *hist; const char *c; LIST_HEAD(msgs); - int len; - char *s; if (line == NULL) { printf("\n"); @@ -112,13 +110,7 @@ static void cli_complete(char *line) if (hist == NULL || strcmp(hist->line, line)) add_history(line); - len = strlen(line); - s = xmalloc(len + 2); - snprintf(s, len + 2, "%s\n", line); - xfree(line); - line = s; - - nft_run_cmd_from_buffer(cli_nft, line, len + 2); + nft_run_cmd_from_buffer(cli_nft, line, strlen(line) + 1); xfree(line); } -- cgit v1.2.3