Issue 5475 - Update adblockpluscore dependency to revision hg:b935a0402215

src/DefaultFileSystem.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 106 matching lines @@
     if (err == ERROR_FILE_NOT_FOUND ||
         err == ERROR_PATH_NOT_FOUND ||
         err == ERROR_INVALID_DRIVE)
     {
       return result;
     }
     throw RuntimeErrorWithErrno("Unable to stat " + path);
   }
 
   result.exists = true;
-  if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-  {
-    result.isFile = false;
-    result.isDirectory = true;
-  }
-  else
-  {
-    result.isFile = true;
-    result.isDirectory = false;
-  }
 
   // See http://support.microsoft.com/kb/167296 on this conversion
   #define FILE_TIME_TO_UNIX_EPOCH_OFFSET 116444736000000000LL
   #define FILE_TIME_TO_MILLISECONDS_FACTOR 10000
   ULARGE_INTEGER time;
   time.LowPart = data.ftLastWriteTime.dwLowDateTime;
   time.HighPart = data.ftLastWriteTime.dwHighDateTime;
   result.lastModified = (time.QuadPart - FILE_TIME_TO_UNIX_EPOCH_OFFSET) /
       FILE_TIME_TO_MILLISECONDS_FACTOR;
   return result;
 #else
   struct stat nativeStat;
   const int failure = stat(NormalizePath(path).c_str(), &nativeStat);
   if (failure)
   {
     if (errno == ENOENT)
       return result;
     throw RuntimeErrorWithErrno("Unable to stat " + path);
   }
   result.exists = true;
-  result.isFile = S_ISREG(nativeStat.st_mode);
-  result.isDirectory = S_ISDIR(nativeStat.st_mode);
 
   #define MSEC_IN_SEC 1000
   #define NSEC_IN_MSEC 1000000
   // Note: _POSIX_C_SOURCE macro is defined automatically on Linux due to g++
   // defining _GNU_SOURCE macro. On OS X we still fall back to the "no
   // milliseconds" branch, it has st_mtimespec instead of st_mtim.
 #if _POSIX_C_SOURCE >= 200809L
   result.lastModified = static_cast<int64_t>(nativeStat.st_mtim.tv_sec) * MSEC_IN_SEC
                       +  static_cast<int64_t>(nativeStat.st_mtim.tv_nsec) / NSEC_IN_MSEC;
 #else
@@ skipping 34 matching lines @@
   {
     basePath.resize(basePath.size() - 1);
   }
 }
 
 DefaultFileSystem::DefaultFileSystem(const Scheduler& scheduler, std::unique_ptr<DefaultFileSystemSync> syncImpl)
   : scheduler(scheduler), syncImpl(std::move(syncImpl))
 {
 }
 
-void DefaultFileSystem::Read(const std::string& path,
+void DefaultFileSystem::Read(const std::string& fileName,
                              const ReadCallback& callback) const
 {
-  scheduler([this, path, callback]
+  scheduler([this, fileName, callback]
   {
     std::string error;
     try
     {
-      auto data = syncImpl->Read(path);
+      auto data = syncImpl->Read(Resolve(fileName));
       callback(std::move(data), error);
       return;
     }
     catch (std::exception& e)
     {
       error = e.what();
     }
     catch (...)
     {
-      error =  "Unknown error while reading from " + path;
+      error =  "Unknown error while reading from " + fileName + " as " + Resolve(fileName);
     }
     callback(IOBuffer(), error);
   });
 }
 
-void DefaultFileSystem::Write(const std::string& path,
+void DefaultFileSystem::Write(const std::string& fileName,
                               const IOBuffer& data,
                               const Callback& callback)
 {
-  scheduler([this, path, data, callback]
+  scheduler([this, fileName, data, callback]
   {
     std::string error;
     try
     {
-      syncImpl->Write(path, data);
+      syncImpl->Write(Resolve(fileName), data);
     }
     catch (std::exception& e)
     {
       error = e.what();
     }
     catch (...)
     {
-      error = "Unknown error while writing to " + path;
+      error = "Unknown error while writing to " + fileName + " as " + Resolve(fileName);
     }
     callback(error);
   });
 }
 
-void DefaultFileSystem::Move(const std::string& fromPath,
-                             const std::string& toPath,
+void DefaultFileSystem::Move(const std::string& fromFileName,
+                             const std::string& toFileName,
                              const Callback& callback)
 {
-  scheduler([this, fromPath, toPath, callback]
+  scheduler([this, fromFileName, toFileName, callback]
   {
     std::string error;
     try
     {
-      syncImpl->Move(fromPath, toPath);
+      syncImpl->Move(Resolve(fromFileName), Resolve(toFileName));
     }
     catch (std::exception& e)
     {
       error = e.what();
     }
     catch (...)
     {
-      error = "Unknown error while moving " + fromPath + " to " + toPath;
+      error = "Unknown error while moving " + fromFileName + " to " + toFileName;
     }
     callback(error);
   });
 }
 
-void DefaultFileSystem::Remove(const std::string& path,
+void DefaultFileSystem::Remove(const std::string& fileName,
                                const Callback& callback)
 {
-  scheduler([this, path, callback]
+  scheduler([this, fileName, callback]
   {
     std::string error;
     try
     {
-      syncImpl->Remove(path);
+      syncImpl->Remove(Resolve(fileName));
     }
     catch (std::exception& e)
     {
       error = e.what();
     }
     catch (...)
     {
-      error = "Unknown error while removing " + path;
+      error = "Unknown error while removing " + fileName + " as " + Resolve(fileName);
     }
     callback(error);
   });
 }
 
-void DefaultFileSystem::Stat(const std::string& path,
+void DefaultFileSystem::Stat(const std::string& fileName,
                              const StatCallback& callback) const
 {
-  scheduler([this, path, callback]
+  scheduler([this, fileName, callback]
   {
     std::string error;
     try
     {
-      auto result = syncImpl->Stat(path);
+      auto result = syncImpl->Stat(Resolve(fileName));
       callback(result, error);
       return;
     }
     catch (std::exception& e)
     {
       error = e.what();
     }
     catch (...)
     {
-      error = "Unknown error while calling stat on " + path;
+      error = "Unknown error while calling stat on " + fileName + " as " + Resolve(fileName);
     }
     callback(StatResult(), error);
   });
 }
 
-std::string DefaultFileSystem::Resolve(const std::string& path) const
+std::string DefaultFileSystem::Resolve(const std::string& fileName) const
 {
-  return syncImpl->Resolve(path);
+  return syncImpl->Resolve(fileName);
 }