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>
 
@@ skipping 67 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
 {
-#ifdef WIN32
-  // Resolve to LocalLow folder
+  return basePath + "\\" + path;

[Felix Dahlke, 2013/04/30 09:14:52]

\\ won't work on UNIX, but I think / should work everywhere.

[Wladimir Palant, 2013/04/30 09:29:50]

1) This path separator is Windows-specific. Please define it in a cross-platform
way, e.g.:

#ifdef _WIN32
#define PATH_SEPARATOR '\\'
#else
#define PATH_SEPARATOR '/'
#endif

And use PATH_SEPARATOR here.

2) What if path is already an absolute path? You need to call PathIsRelative()
on Windows and check first whether the path starts with / on all other platforms
- absolute paths should be returned unchanged.

3) What if SetBasePath() was never called (basePath is empty)? We should return
the path unchanged then, the caller shouldn't be required to call SetBasePath().

4) While we are at it, maybe we should already prefix Windows paths with \\?\
unless PathIsUNC() returns true. This makes sure we don't hit the MAX_PATH
limit.

+}
 
-  OSVERSIONINFOEX osvi;
-  ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
-  osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-  BOOL res = GetVersionEx((OSVERSIONINFO*) &osvi);
+void DefaultFileSystem::SetBasePath(const std::string& path)
+{
 
-  if(res == 0 ) return std::string(path);
-
-  std::wstring resolvedW = L"";
-  wchar_t resolvedPath[MAX_PATH];
-  HRESULT hr;
-  if (osvi.dwMajorVersion >= 6)
+  if (path.rfind('\\') == (path.length() - 1))

[Felix Dahlke, 2013/04/30 09:14:52]

How about if (*path.rbegin() == '\\')?

This also needs to check for / on Linux, maybe both on Windows since / is AFAIK
generally a legal path separator in Windows.

[Wladimir Palant, 2013/04/30 09:29:50]

Please search for PATH_SEPARATOR here as well, not for Windows-specific path
separators. Btw, I would rather write that check as:

  if (path.length() && path[path.length() - 1] == PATH_SEPARATOR)

But that's pretty much a matter of taste.

   {
-    hr = SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, 0, 0, resolvedPath);
+    basePath = path.substr(0, path.length() - 1);

[Felix Dahlke, 2013/04/30 09:14:52]

Never used this, but basePath.pop_back(); seems to be possible in C++0x.

   }
   else
   {
-    hr = SHGetFolderPath(NULL, CSIDL_APPDATA, 0, 0, resolvedPath);
+    basePath = path;
   }
-  if (FAILED(hr))
-    return std::string(path);
-  resolvedW.assign(resolvedPath);
-
-  // TODO: Better conversion here
-  std::string resolved(resolvedW.begin(), resolvedW.end());
-  if (osvi.dwMajorVersion >= 6)
-  {
-    resolved.append("Low\\AdblockPlus\\");
-  }
-  else
-  {
-    resolved.append("\\AdblockPlus\\");
-  }
-  resolved.append(path);
-  return resolved;
-#else
-  return std::string(path);
-#endif
 }