refactor

CHANGELOG.md

@@ -10,6 +10,7 @@
 * ~~\#33 Complete initial v2.0 documentation~~
 * \#42 [bug] Remote mount directory listing on Windows connected to Linux is failing
 * \#43 [bug] Directories are not importing properly for Sia
+* \#44 [bug] Windows-to-Linux remote mount ignores `CREATE_NEW`
 
 ### Changes from v2.0.5-rc
 

repertory/librepertory/include/common.hpp

@@ -222,7 +222,6 @@ using WCHAR = wchar_t;
 
 #define MAX_PATH 260
 
-#define STATUS_SUCCESS std::uint32_t{0U}
 #define STATUS_ACCESS_DENIED std::uint32_t{0xC0000022L}
 #define STATUS_DEVICE_BUSY std::uint32_t{0x80000011L}
 #define STATUS_DEVICE_INSUFFICIENT_RESOURCES std::uint32_t{0xC0000468L}
@@ -235,11 +234,13 @@ using WCHAR = wchar_t;
 #define STATUS_INVALID_HANDLE std::uint32_t{0xC0000006L}
 #define STATUS_INVALID_IMAGE_FORMAT std::uint32_t{0xC000007BL}
 #define STATUS_INVALID_PARAMETER std::uint32_t{0xC000000DL}
-#define STATUS_NO_MEMORY std::uint32_t{0xC0000017L}
 #define STATUS_NOT_IMPLEMENTED std::uint32_t{0xC0000002L}
+#define STATUS_NO_MEMORY std::uint32_t{0xC0000017L}
+#define STATUS_OBJECT_NAME_COLLISION std::uint32_t{0xC0000035L}
 #define STATUS_OBJECT_NAME_EXISTS std::uint32_t{0x40000000L}
 #define STATUS_OBJECT_NAME_NOT_FOUND std::uint32_t{0xC0000034L}
 #define STATUS_OBJECT_PATH_INVALID std::uint32_t{0xC0000039L}
+#define STATUS_SUCCESS std::uint32_t{0U}
 #define STATUS_UNEXPECTED_IO_ERROR std::uint32_t{0xC00000E9L}
 
 #define CONVERT_STATUS_NOT_IMPLEMENTED(e)                                      \

repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp

@@ -1120,10 +1120,15 @@ auto remote_server::winfsp_create(PWSTR file_name, UINT32 create_options,
     -> packet::error_type {
   REPERTORY_USES_FUNCTION_NAME();
 
-  const auto relative_path = utils::string::to_utf8(file_name);
-  const auto file_path = construct_path(relative_path);
-  exists = utils::file::file(file_path).exists();
+  auto relative_path = utils::string::to_utf8(file_name);
+  auto file_path = construct_path(relative_path);
+  exists = utils::file::file{file_path}.exists() ||
+           utils::file::directory{file_path}.exists();
 
+  auto ret{static_cast<packet::error_type>(STATUS_SUCCESS)};
+  if (exists) {
+    ret = static_cast<packet::error_type>(STATUS_OBJECT_NAME_COLLISION);
+  } else {
     if ((create_options & FILE_DIRECTORY_FILE) != 0U) {
       attributes |= FILE_ATTRIBUTE_DIRECTORY;
     } else {
@@ -1135,7 +1140,7 @@ auto remote_server::winfsp_create(PWSTR file_name, UINT32 create_options,
     std::uint32_t flags{0U};
     utils::windows_create_to_unix(create_options, granted_access, flags, mode);
 
-  int res = 0;
+    auto res{0};
     if ((create_options & FILE_DIRECTORY_FILE) != 0U) {
       res = mkdir(file_path.c_str(), mode);
       if (res >= 0) {
@@ -1161,8 +1166,10 @@ auto remote_server::winfsp_create(PWSTR file_name, UINT32 create_options,
       populate_file_info(api_path, 0, attributes, *file_info);
     }
 
-  auto ret = static_cast<packet::error_type>(
+    ret = static_cast<packet::error_type>(
         utils::unix_error_to_windows((res < 0) ? errno : 0));
+  }
+
   RAISE_REMOTE_FUSE_SERVER_EVENT(function_name, file_path, ret);
   return ret;
 }

repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_client.cpp

@@ -188,22 +188,20 @@ auto remote_client::winfsp_create(PWSTR file_name, UINT32 create_options,
     DECODE_OR_IGNORE(&response, normalized_name);
     DECODE_OR_IGNORE(&response, exists);
 
-    if (ret == STATUS_SUCCESS) {
     *file_desc = reinterpret_cast<PVOID>(handle);
-      set_open_info(to_handle(*file_desc),
-                    open_info{
+    set_open_info(to_handle(*file_desc), open_info{
                                              "",
                                              nullptr,
                                              {},
                                              utils::string::to_utf8(file_name),
                                          });
+  }
+
 #if defined(_WIN32)
-      if (exists) {
+  if (ret == STATUS_OBJECT_NAME_COLLISION && exists != 0U) {
     ::SetLastError(ERROR_ALREADY_EXISTS);
   }
-#endif
-    }
-  }
+#endif // defined(_WIN32)
 
   return ret;
 }