Date: Mon, 10 Feb 2014 15:04:59 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r261714 - head/usr.bin/iscsictl Message-ID: <201402101504.s1AF4xt0072886@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Mon Feb 10 15:04:59 2014 New Revision: 261714 URL: http://svnweb.freebsd.org/changeset/base/261714 Log: Make iscsictl(8) properly handle (optional) semicolons in iscsi.conf, instead of ignoring them and echoing them to stdout. Sponsored by: The FreeBSD Foundation Modified: head/usr.bin/iscsictl/parse.y head/usr.bin/iscsictl/token.l Modified: head/usr.bin/iscsictl/parse.y ============================================================================== --- head/usr.bin/iscsictl/parse.y Mon Feb 10 15:03:08 2014 (r261713) +++ head/usr.bin/iscsictl/parse.y Mon Feb 10 15:04:59 2014 (r261714) @@ -57,7 +57,7 @@ extern void yyrestart(FILE *); %token AUTH_METHOD HEADER_DIGEST DATA_DIGEST TARGET_NAME TARGET_ADDRESS %token INITIATOR_NAME INITIATOR_ADDRESS INITIATOR_ALIAS USER SECRET -%token MUTUAL_USER MUTUAL_SECRET SESSION_TYPE PROTOCOL IGNORED +%token MUTUAL_USER MUTUAL_SECRET SEMICOLON SESSION_TYPE PROTOCOL IGNORED %token EQUALS OPENING_BRACKET CLOSING_BRACKET %union @@ -86,6 +86,8 @@ target: STR OPENING_BRACKET target_entr target_entries: | target_entries target_entry + | + target_entries target_entry SEMICOLON ; target_entry: Modified: head/usr.bin/iscsictl/token.l ============================================================================== --- head/usr.bin/iscsictl/token.l Mon Feb 10 15:03:08 2014 (r261713) +++ head/usr.bin/iscsictl/token.l Mon Feb 10 15:04:59 2014 (r261714) @@ -87,7 +87,9 @@ chapDigest { return IGNORED; } \{ { return OPENING_BRACKET; } \} { return CLOSING_BRACKET; } = { return EQUALS; } +; { return SEMICOLON; } #.*$ /* ignore comments */; \n { lineno++; } [ \t]+ /* ignore whitespace */; +. { yylval.str = strdup(yytext); return STR; } %%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402101504.s1AF4xt0072886>