Fix iscsictl(8) and ctld(8) to correctly handle Windows newlines
(CRLF) in iscsi.conf and ctl.conf. MFC after: 1 month Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
dbb1ee18cc
commit
1cb587dc9c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=273822
@ -90,6 +90,7 @@ chapDigest { return IGNORED; }
|
|||||||
= { return EQUALS; }
|
= { return EQUALS; }
|
||||||
; { return SEMICOLON; }
|
; { return SEMICOLON; }
|
||||||
#.*$ /* ignore comments */;
|
#.*$ /* ignore comments */;
|
||||||
|
\r\n { lineno++; }
|
||||||
\n { lineno++; }
|
\n { lineno++; }
|
||||||
[ \t]+ /* ignore whitespace */;
|
[ \t]+ /* ignore whitespace */;
|
||||||
. { yylval.str = strdup(yytext); return STR; }
|
. { yylval.str = strdup(yytext); return STR; }
|
||||||
|
@ -82,6 +82,7 @@ timeout { return TIMEOUT; }
|
|||||||
\{ { return OPENING_BRACKET; }
|
\{ { return OPENING_BRACKET; }
|
||||||
\} { return CLOSING_BRACKET; }
|
\} { return CLOSING_BRACKET; }
|
||||||
#.*$ /* ignore comments */;
|
#.*$ /* ignore comments */;
|
||||||
|
\r\n { lineno++; }
|
||||||
\n { lineno++; }
|
\n { lineno++; }
|
||||||
; { return SEMICOLON; }
|
; { return SEMICOLON; }
|
||||||
[ \t]+ /* ignore whitespace */;
|
[ \t]+ /* ignore whitespace */;
|
||||||
|
Loading…
Reference in New Issue
Block a user