From 9c2c27f8c409da8132c840e8379246c504f38035 Mon Sep 17 00:00:00 2001
From: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
Date: Thu, 20 Nov 2014 14:17:13 +0000
Subject: [PATCH] cmdline: fix for bsd
Some features of the cmdline were broken in FreeBSD as a result of
termios not being compiled.
Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/librte_cmdline/cmdline.h | 2 --
lib/librte_cmdline/cmdline_socket.c | 10 +---------
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/lib/librte_cmdline/cmdline.h b/lib/librte_cmdline/cmdline.h
index 4c28d37d46..06ae086686 100644
--- a/lib/librte_cmdline/cmdline.h
+++ b/lib/librte_cmdline/cmdline.h
@@ -71,9 +71,7 @@ struct cmdline {
cmdline_parse_ctx_t *ctx;
struct rdline rdl;
char prompt[RDLINE_PROMPT_SIZE];
-#ifdef RTE_EXEC_ENV_LINUXAPP
struct termios oldterm;
-#endif
};
struct cmdline *cmdline_new(cmdline_parse_ctx_t *ctx, const char *prompt, int s_in, int s_out);
diff --git a/lib/librte_cmdline/cmdline_socket.c b/lib/librte_cmdline/cmdline_socket.c
index b51b537648..6820b6dfc5 100644
--- a/lib/librte_cmdline/cmdline_socket.c
+++ b/lib/librte_cmdline/cmdline_socket.c
@@ -93,7 +93,6 @@ struct cmdline *
cmdline_stdin_new(cmdline_parse_ctx_t *ctx, const char *prompt)
{
struct cmdline *cl;
-#ifdef RTE_EXEC_ENV_LINUXAPP
struct termios oldterm, term;
tcgetattr(0, &oldterm);
@@ -101,14 +100,12 @@ cmdline_stdin_new(cmdline_parse_ctx_t *ctx, const char *prompt)
term.c_lflag &= ~(ICANON | ECHO | ISIG);
tcsetattr(0, TCSANOW, &term);
setbuf(stdin, NULL);
-#endif
cl = cmdline_new(ctx, prompt, 0, 1);
-#ifdef RTE_EXEC_ENV_LINUXAPP
if (cl)
memcpy(&cl->oldterm, &oldterm, sizeof(term));
-#endif
+
return cl;
}
@@ -118,10 +115,5 @@ cmdline_stdin_exit(struct cmdline *cl)
if (!cl)
return;
-#ifdef RTE_EXEC_ENV_LINUXAPP
tcsetattr(fileno(stdin), TCSANOW, &cl->oldterm);
-#else
- /* silent the compiler */
- (void)cl;
-#endif
}
--
2.39.5