Date: Sat, 29 Nov 2014 15:39:32 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r275248 - in stable/10: usr.bin/iscsictl usr.sbin/ctld Message-ID: <201411291539.sATFdWPg053155@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Sat Nov 29 15:39:31 2014 New Revision: 275248 URL: https://svnweb.freebsd.org/changeset/base/275248 Log: 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 Modified: stable/10/usr.bin/iscsictl/token.l stable/10/usr.sbin/ctld/token.l Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/iscsictl/token.l ============================================================================== --- stable/10/usr.bin/iscsictl/token.l Sat Nov 29 15:37:51 2014 (r275247) +++ stable/10/usr.bin/iscsictl/token.l Sat Nov 29 15:39:31 2014 (r275248) @@ -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; } Modified: stable/10/usr.sbin/ctld/token.l ============================================================================== --- stable/10/usr.sbin/ctld/token.l Sat Nov 29 15:37:51 2014 (r275247) +++ stable/10/usr.sbin/ctld/token.l Sat Nov 29 15:39:31 2014 (r275248) @@ -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 */;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411291539.sATFdWPg053155>