From patchwork Mon Mar 7 15:25:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yevgeny Kliteynik X-Patchwork-Id: 615871 X-Patchwork-Delegate: alexne@voltaire.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p27FY2MU025027 for ; Mon, 7 Mar 2011 15:34:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753431Ab1CGPd5 (ORCPT ); Mon, 7 Mar 2011 10:33:57 -0500 Received: from mail.mellanox.co.il ([194.90.237.43]:52591 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753227Ab1CGPd4 (ORCPT ); Mon, 7 Mar 2011 10:33:56 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from kliteyn@mellanox.co.il) with SMTP; 7 Mar 2011 17:42:50 +0200 Received: from [10.4.1.43] (10.4.1.43) by MTLCAS01.mtl.com (10.0.8.70) with Microsoft SMTP Server id 14.1.270.1; Mon, 7 Mar 2011 17:33:44 +0200 Message-ID: <4D74F8EC.3090504@mellanox.co.il> Date: Mon, 7 Mar 2011 17:25:32 +0200 From: Yevgeny Kliteynik Reply-To: User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.9) Gecko/20100423 Thunderbird/3.0.4 MIME-Version: 1.0 To: CC: Linux RDMA , , Yevgeny Kliteynik Subject: [PATCH] pensm/osm_qos_parser: QOS parser doesn't work after syntax error X-Originating-IP: [10.4.1.43] Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 07 Mar 2011 15:34:12 +0000 (UTC) diff --git a/opensm/opensm/osm_qos_parser_l.l b/opensm/opensm/osm_qos_parser_l.l index 4633e0e..559974b 100644 --- a/opensm/opensm/osm_qos_parser_l.l +++ b/opensm/opensm/osm_qos_parser_l.l @@ -355,6 +355,10 @@ QUOTED_TEXT \"[^\"]*\" . { SAVE_POS; yylval = strdup(yytext); return TK_TEXT;} +<> { + YY_NEW_FILE; + yyterminate(); + } %% diff --git a/opensm/opensm/osm_qos_parser_y.y b/opensm/opensm/osm_qos_parser_y.y index 7118b79..51f72e3 100644 --- a/opensm/opensm/osm_qos_parser_y.y +++ b/opensm/opensm/osm_qos_parser_y.y @@ -149,6 +149,7 @@ extern char * yytext; extern int yylex (void); extern FILE * yyin; extern int errno; +extern void yyrestart(FILE *input_file); int yyparse(); #define RESET_BUFFER __parser_tmp_struct_reset() @@ -2354,7 +2355,10 @@ int osm_qos_parse_policy_file(IN osm_subn_t * p_subn) Exit: if (yyin) + { + yyrestart(yyin); fclose(yyin); + } OSM_LOG_EXIT(p_qos_parser_osm_log); return res; }