improve usability

XUranus · Nov 9, 2023 · 12ef292 · 12ef292
1 parent 03a5e2e
commit 12ef292
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/include/VolumeCopyMountProvider.h b/include/VolumeCopyMountProvider.h
@@ -9,7 +9,7 @@
 #ifndef VOLUMEBACKUP_VOLUME_COPY_MOUNT_PROVIDER_HEADER
 #define VOLUMEBACKUP_VOLUME_COPY_MOUNT_PROVIDER_HEADER
 
-#include "VolumeProtectMacros.h"
+#include "common/VolumeProtectMacros.h"
 
 #ifdef _MSC_VER
 

diff --git a/include/VolumeProtector.h b/include/VolumeProtector.h
@@ -10,7 +10,7 @@
 #ifndef VOLUMEBACKUP_PROTECT_FACADE_HEADER
 #define VOLUMEBACKUP_PROTECT_FACADE_HEADER
 
-#include "VolumeProtectMacros.h"
+#include "common/VolumeProtectMacros.h"
 #include <string>
 
 /**

diff --git a/src/native/FileSystemAPI.cpp b/src/native/FileSystemAPI.cpp
@@ -346,7 +346,7 @@ bool fsapi::RemoveFile(const std::string& dirPath, const std::string& filename)
 
 uint32_t fsapi::ProcessorsNum()
 {
-#ifdef __linux
+#ifdef __linux__
     auto processorCount = sysconf(_SC_NPROCESSORS_ONLN);
     return processorCount <= 0 ? DEFAULT_PROCESSORS_NUM : processorCount;
 #endif

diff --git a/src/native/TaskResourceManager.cpp b/src/native/TaskResourceManager.cpp
@@ -25,6 +25,11 @@ using namespace volumeprotect::common;
 
 namespace {
     constexpr auto DUMMY_SESSION_INDEX = 0;
+#ifdef _WIN32
+    const std::string SEPARTOR = "\\";
+#else
+    const std::string SEPARTOR = "/";
+#endif
 }
 
 // implement static util functions...
@@ -373,7 +378,7 @@ bool RestoreTaskResourceManager::PrepareCopyResource()
 bool RestoreTaskResourceManager::ResourceExists()
 {
     for (const std::string& copyDataFile : m_copyDataFiles) {
-        if (!fsapi::IsFileExists(copyDataFile)) {
+        if (!fsapi::IsFileExists(m_copyDataDirPath + SEPARTOR + copyDataFile)) {
             ERRLOG("restore copy %s, copy data file %s not exists", m_copyName.c_str(), copyDataFile.c_str());
             return false;
         }