Changeset 9515

Timestamp:

2005-03-30T15:50:09+12:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed a fairly obscure bug where isspace was returning true on characters that weren't actually spaces, thus messing up some Unicode values when reading from main.cfg/collect.cfg files on Windows only. Seems that it was an issue with signed/unsigned chars, because casting the isspace argument to a unsigned char fixed the problem.

File:

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

trunk/gsdl/lib/cfgread.cpp

@@ -25 +25 @@
 
 #include "cfgread.h"
-#include <ctype.h> // for isspace()
+#include <cctype> // for isspace()
 
 int write_ini_line (ofstream &fileout, const text_t &key, const text_t &value) {
@@ -116 +116 @@
 
   // skip white space
-  while (!filein.eof() && isspace(c1)) { filein.get(c1); }
+  while (!filein.eof() && isspace((unsigned char) c1)) { filein.get(c1); }
 
     // ignore comments
@@ -122 +122 @@
     while (!filein.eof() && c1!='\n' && c1!='\r') { filein.get(c1); }
     // skip white space...
-    while (!filein.eof() && isspace(c1)) { filein.get(c1); }
+    while (!filein.eof() && isspace((unsigned char) c1)) { filein.get(c1); }
   }
 
@@ -148 +148 @@
     // get token or a whole phrase
     while (!filein.eof()) {
-      if (isspace(c1)) {
+      if (isspace((unsigned char) c1)) {
     if (! inquote) {
       // end of token, not inside quote marks