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 29 matching lines @@
   if (rename(fromPath.c_str(), toPath.c_str()))
     throw RuntimeErrorWithErrno("Failed to move " + fromPath + " to " + toPath);
 }
 
 void DefaultFileSystem::Remove(const std::string& path)
 {
   if (remove(path.c_str()))
     throw RuntimeErrorWithErrno("Failed to remove " + path);
 }
 
+/*
+ * In order to get millisecond resolution for modification times, it's necessary to use the 'stat' structure defined in
+ * POSIX 2008, which has 'struct timespec st_mtim' instead of 'time_t st_mtime'. Use "#define _POSIX_C_SOURCE 200809L" 
+ * before the headers to invoke. The trouble is that not all systems may have this available, a category that includes 
+ * MS Windows, and so we'll need multiple implementations.
+ */
 FileSystem::StatResult DefaultFileSystem::Stat(const std::string& path) const
 {
 #ifdef WIN32
   struct _stat nativeStat;
   const int failure = _stat(path.c_str(), &nativeStat);
 #else
   struct stat nativeStat;
   const int failure = stat(path.c_str(), &nativeStat);
 #endif
   if (failure) {
     if (errno == ENOENT)
       return FileSystem::StatResult();
     throw RuntimeErrorWithErrno("Unable to stat " + path);
   }
   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
-  wchar_t* resolvedPath;
-  HRESULT hr = SHGetKnownFolderPath(FOLDERID_LocalAppDataLow, 0, NULL, &resolvedPath);
-  if (FAILED(hr))
-    return std::string(path);

[Wladimir Palant, 2013/04/24 09:17:35]

Why not just return path; here?

-  std::wstring resolvedW(resolvedPath);
-  CoTaskMemFree(resolvedPath);
-
-  // TODO: Better conversion here
-  std::string resolved(resolvedW.begin(), resolvedW.end());

[Wladimir Palant, 2013/04/24 09:17:35]

Please use Utils::ToUTF8String() here (and we are currently going to be in
trouble either way if we have Unicode characters in the path).

-  resolved.append("\\AdblockPlus\\");
-  resolved.append(path);
-  return resolved;
-#else
-  return std::string(path);

[Wladimir Palant, 2013/04/24 09:17:35]

Why not just return path; here?

-#endif
+  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 ((*basePath.rbegin() == PATH_SEPARATOR))

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

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

+  {
+    basePath.pop_back();
+  }
+}
+