From: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH] cmdline: Fix broken functionality in FreeBSD
Date: Thu, 20 Nov 2014 14:17:13 +0000 [thread overview]
Message-ID: <1416493033-13450-1-git-send-email-sergio.gonzalez.monroy@intel.com> (raw)
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>
---
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 4c28d37..06ae086 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 b51b537..6820b6d 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.1.0
next reply other threads:[~2014-11-20 14:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-20 14:17 Sergio Gonzalez Monroy [this message]
2014-11-20 14:20 ` Neil Horman
2014-11-20 16:42 ` Gonzalez Monroy, Sergio
2014-11-20 17:03 ` Neil Horman
2014-11-20 17:19 ` Bruce Richardson
2014-11-20 18:31 ` Neil Horman
2014-11-21 9:18 ` Bruce Richardson
2014-11-24 15:51 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1416493033-13450-1-git-send-email-sergio.gonzalez.monroy@intel.com \
--to=sergio.gonzalez.monroy@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).