From patchwork Thu Nov 20 14:17:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Gonzalez Monroy X-Patchwork-Id: 1394 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id F316C7F11; Thu, 20 Nov 2014 15:06:48 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id D3B4E7F0C for ; Thu, 20 Nov 2014 15:06:46 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 20 Nov 2014 06:15:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,424,1413270000"; d="scan'208";a="611122588" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga001.jf.intel.com with ESMTP; 20 Nov 2014 06:17:15 -0800 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id sAKEHEHh011458 for ; Thu, 20 Nov 2014 14:17:14 GMT Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id sAKEHDkA013488 for ; Thu, 20 Nov 2014 14:17:13 GMT Received: (from smonroy@localhost) by sivswdev02.ir.intel.com with id sAKEHDak013484 for dev@dpdk.org; Thu, 20 Nov 2014 14:17:13 GMT From: Sergio Gonzalez Monroy To: dev@dpdk.org Date: Thu, 20 Nov 2014 14:17:13 +0000 Message-Id: <1416493033-13450-1-git-send-email-sergio.gonzalez.monroy@intel.com> X-Mailer: git-send-email 1.8.5.4 Subject: [dpdk-dev] [PATCH] cmdline: Fix broken functionality in FreeBSD X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Some features of the cmdline were broken in FreeBSD as a result of termios not being compiled. Signed-off-by: Sergio Gonzalez Monroy Acked-by: Neil Horman Acked-by: Bruce Richardson --- 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 }