orthanc: Core/Toolbox.cpp comparison

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 28 Jan 2016 17:07:22 +0100
parents	b1291df2f780
children	ff11ba08e5d0

comparison

equal deleted inserted replaced

-:c32a8fab4fc4
+:7a05144cb919
 {
 finish = true;
 }
 #endif
 void Toolbox::USleep(uint64_t microSeconds)
 {
 #if defined(_WIN32)
 ::Sleep(static_cast<DWORD>(microSeconds / static_cast<uint64_t>(1000)));
 #elif defined(__linux) || defined(__APPLE__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
 void Toolbox::ReadFile(std::string& content,
 const std::string& path)
 {
-if (!boost::filesystem::is_regular_file(path))
+if (!IsRegularFile(path))
 {
 LOG(ERROR) << std::string("The path does not point to a regular file: ") << path;
 throw OrthancException(ErrorCode_RegularFileExpected);
 }
 void Toolbox::RemoveFile(const std::string& path)
 {
 if (boost::filesystem::exists(path))
 {
-if (boost::filesystem::is_regular_file(path))
+if (IsRegularFile(path))
 {
 boost::filesystem::remove(path);
 }
 else
 {
 return static_cast<int>(_getpid());
 #else
 return static_cast<int>(getpid());
 #endif
 }
+bool Toolbox::IsRegularFile(const std::string& path)
+{
+namespace fs = boost::filesystem;
+try
+{
+if (fs::exists(path))
+{
+fs::file_status status = fs::status(path);
+return (status.type() == boost::filesystem::regular_file ||
+status.type() == boost::filesystem::reparse_file);   // Fix BitBucket issue #11
+}
+}
+catch (fs::filesystem_error&)
+{
+}
+return false;
+}
 }

Mercurial > hg > orthanc