Skip to content
Snippets Groups Projects
Commit 9c27f56c authored by Nick Mathewson's avatar Nick Mathewson :game_die:
Browse files

Fix torrc-format documentation corner cases

We don't require that the final line be terminated, and we open
windows torrc files in text mode.

Closes ticket 22795.
parent 6ff67389
No related branches found
No related tags found
No related merge requests found
......@@ -18,9 +18,10 @@ does, not what it should do.
; specified in RFC5234.
; A file is interpreted as every Entry in the file, in order.
TorrcFile = *Line
TorrcFile = *Line [ UnterminatedLine ]
Line = BlankLine / Entry
Line = BlankLine LF / Entry LF
UnterminatedLine = BlankLine / Entry
BlankLine = *WSP OptComment LF
BlankLine =/ *WSP LF
......@@ -69,6 +70,12 @@ does, not what it should do.
; Anything besides NUL and LF
NonLF = %x01-%x09 / %x0b - %xff
; Note that on windows, we open our configuration files in "text" mode,
; which causes CRLF pairs to be interpreted as LF. So, on windows:
; LF = [ %x0d ] %x0a
; but everywhere else,
LF = %0x0a
OCTDIG = '0' - '7'
KC = Any character except an isspace() character or '#' or NUL
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment