Changeset 3047 for box/trunk

Timestamp:

03/12/2011 23:07:41 (6 months ago)

Author:

chris

Message:

Fix regex case issues on Windows (\S converted to \s for example). Ensure that
filename comparison is always case insensitive on Windows, by convention.

File:

• box/trunk/lib/common/ExcludeList.cpp (modified) (4 diffs)

box/trunk/lib/common/ExcludeList.cpp

@@ -100 +100 @@
         {
                 output.replace(pos, 1, "\\" DIRECTORY_SEPARATOR);
-        }
-
-        for (std::string::iterator i = output.begin(); i != output.end(); i++)
-        {
-                *i = tolower(*i);
         }
 
@@ -186 +181 @@
                         {
                                 std::string entry = *i;
+                                int flags = REG_EXTENDED | REG_NOSUB;
 
                                 // Convert any forward slashes in the string
@@ -192 +188 @@
                                 #ifdef WIN32
                                 entry = ReplaceSlashesRegex(entry);
+                                flags |= REG_ICASE; // Windows convention
                                 #endif
 
                                 // Compile
-                                int errcode = ::regcomp(pregex, entry.c_str(), 
-                                        REG_EXTENDED | REG_NOSUB);
+                                int errcode = ::regcomp(pregex, entry.c_str(),
+                                        flags);
 
                                 if (errcode != 0)
@@ -239 +236 @@
 
         #ifdef WIN32
+        // converts to lower case as well
         test = ReplaceSlashesDefinite(test);
         #endif