File system path resolving

src/DefaultFileSystem.cpp

 #include <AdblockPlus/DefaultFileSystem.h>
 #include <cstdio>
 #include <cstring>
 #include <fstream>
 #include <stdexcept>
 
 #include <cerrno>
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #ifdef _WIN32
 #ifndef S_ISDIR
 #define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
 #include <Shlobj.h>
+#include <Shlwapi.h>
 #endif
 
 #ifndef S_ISREG
 #define S_ISREG(mode)  (((mode) & S_IFMT) == S_IFREG)
 #endif
 #endif
 
 #include "../src/Utils.h"
 
 using namespace AdblockPlus;
@@ skipping 59 matching lines @@
   FileSystem::StatResult result;
   result.exists = true;
   result.isFile = S_ISREG(nativeStat.st_mode);
   result.isDirectory = S_ISDIR(nativeStat.st_mode);
   result.lastModified = static_cast<int64_t>(nativeStat.st_mtime) * 1000;
   return result;
 }
 
 std::string DefaultFileSystem::Resolve(const std::string& path) const
 {
-  return basePath + "\\" + path;
+  if (basePath == "")
+  {
+    return path;
+  }
+  else
+  {
+    if (PathIsRelative(Utils::ToUTF16String(path, path.length()).c_str()))

[Wladimir Palant, 2013/05/06 06:18:30]

This is Windows-specific and won't compile on other systems, should be:

#ifdef _WIN32
  if (PathIsRelative(Utils::ToUTF16String(path, path.length()).c_str()))
#else
  if (path.length() && *path.begin() == PATH_SEPARATOR)
#endif

[Wladimir Palant, 2013/05/06 06:19:51]

Oops, exactly the other way round of course:

   if (!path.length() || *path.begin() != PATH_SEPARATOR)

+    {
+      return basePath + PATH_SEPARATOR + path;
+    }
+    else
+    {
+      return path;
+    }
+  }
 }
 
 void DefaultFileSystem::SetBasePath(const std::string& path)
 {
+  basePath = path;
 
-  if (path.rfind('\\') == (path.length() - 1))
+  if ((*basePath.rbegin() == PATH_SEPARATOR))

[Wladimir Palant, 2013/05/06 06:18:30]

Nit: You seem to have an extra pair parentheses here.

   {
-    basePath = path.substr(0, path.length() - 1);
-  }
-  else
-  {
-    basePath = path;
+    basePath.pop_back();
   }
 }