[or-cvs] [tor/master 6/6] Note that the torrc format doesn't need nl at end

[nickm at torproject.org]

Author: Sebastian Hahn <sebastian at torproject.org>
Date: Fri, 24 Sep 2010 13:32:27 +0200
Subject: Note that the torrc format doesn't need nl at end
Commit: 851255170aaa419e9c8f2a7d1b3c7a124a9c2783

---
 src/common/util.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/common/util.c b/src/common/util.c
index 904fd82..abb2753 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -2285,15 +2285,17 @@ const char *
 parse_config_line_from_str(const char *line, char **key_out, char **value_out)
 {
   /* I believe the file format here is supposed to be:
-     FILE = (EMPTYLINE | LINE)*
+     FILE = (EMPTYLINE | LINE)* (EMPTYLASTLINE | LASTLINE)?
 
-     EMPTYLINE = SPACE* NL | COMMENT NL
+     EMPTYLASTLINE = SPACE* | COMMENT
+     EMPTYLINE = EMPTYLASTLINE NL
      SPACE = ' ' | '\r' | '\t'
      COMMENT = '#' NOT-NL*
      NOT-NL = Any character except '\n'
      NL = '\n'
 
-     LINE = SPACE* KEY SPACE* VALUES NL
+     LASTLINE = SPACE* KEY SPACE* VALUES
+     LINE = LASTLINE NL
      KEY = KEYCHAR+
      KEYCHAR = Any character except ' ', '\r', '\n', '\t', '#', "\"
 
-- 
1.7.1