Changeset 3521

Timestamp:

2002-11-08T14:26:17+13:00 (21 years ago)

Author:

jrm21

Message:

subtle bug fix where if a line ended with a space then the following line
would be appended to it, possibly causing parsing problems. Eg

indexes document:text
defaultindex document:text

If "indexes" ended with a space, then "defaultindex" is the name of an
index, not a separate entry!

File:

• trunk/gsdl/lib/cfgread.cpp (modified) (2 diffs)

trunk/gsdl/lib/cfgread.cpp

@@ -163 +163 @@
     values.push_back(curvalue);
     break;
+      } else {
+    // swallow up the EOL chars
+    while (!filein.eof() && (c=='\r' || c=='\n')) filein.get(c);
       }
     } else { // no new line seen
@@ -170 +173 @@
     curvalue.clear();
 
-    //  the record continues on the next line
-    // remove whitespace before next token
-    while (!filein.eof() && isspace(c)) filein.get(c);
+    // remove whitespace (but not newline/CR chars) before next token
+    while (!filein.eof() && (c==' ' || c=='\t')) filein.get(c);
 
   } // while(1)