d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix iscsictl(8) and ctld(8) to correctly handle Windows newlines

Browse Source 
(CRLF) in iscsi.conf and ctl.conf.

MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
trasz 2014-10-29 12:22:32 +00:00
parent a0b8eaf0d7
commit 3af53d3840
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
usr.bin/iscsictl/token.l
View File

@ -90,6 +90,7 @@ chapDigest { return IGNORED; }
= { return EQUALS; }
; { return SEMICOLON; }
#.*$ /* ignore comments */;
\r\n { lineno++; }
\n { lineno++; }
[ \t]+ /* ignore whitespace */;
. { yylval.str = strdup(yytext); return STR; }

1
usr.sbin/ctld/token.l
View File

@ -82,6 +82,7 @@ timeout { return TIMEOUT; }
\{ { return OPENING_BRACKET; }
\} { return CLOSING_BRACKET; }
#.*$ /* ignore comments */;
\r\n { lineno++; }
\n { lineno++; }
; { return SEMICOLON; }
[ \t]+ /* ignore whitespace */;