diff options
| author | trasz <trasz@FreeBSD.org> | 2014-11-29 15:39:31 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2014-11-29 15:39:31 +0000 |
| commit | 59965706b27f25134effa15ea485c0b802cf62fd (patch) | |
| tree | 0d1d70a32732efc214f7ad67ef39ab10c136d93a /usr.bin/iscsictl | |
| parent | 00cfd4605bf13f556abc1e87c1e4b8b2015786a1 (diff) | |
| download | FreeBSD-src-59965706b27f25134effa15ea485c0b802cf62fd.zip FreeBSD-src-59965706b27f25134effa15ea485c0b802cf62fd.tar.gz | |
MFC r273822:
Fix iscsictl(8) and ctld(8) to correctly handle Windows newlines
(CRLF) in iscsi.conf and ctl.conf.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'usr.bin/iscsictl')
| -rw-r--r-- | usr.bin/iscsictl/token.l | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usr.bin/iscsictl/token.l b/usr.bin/iscsictl/token.l index 4866c13..06af167 100644 --- a/usr.bin/iscsictl/token.l +++ b/usr.bin/iscsictl/token.l @@ -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; } |
