Compare commits
3 Commits
9eb8b5e682
...
d664c6a884
Author | SHA1 | Date | |
---|---|---|---|
d664c6a884 | |||
430fc1a651 | |||
314ee5b664 |
@ -1023,8 +1023,15 @@ auto winfsp_drive::Rename(PVOID /*file_node*/, PVOID /*file_desc*/,
|
|||||||
|
|
||||||
const auto handle_error = [this, &from_api_path,
|
const auto handle_error = [this, &from_api_path,
|
||||||
&to_api_path](api_error error) -> NTSTATUS {
|
&to_api_path](api_error error) -> NTSTATUS {
|
||||||
return this->handle_error(function_name, from_api_path + '|' + to_api_path,
|
auto ret = this->handle_error(
|
||||||
error, nullptr, 0U);
|
function_name, from_api_path + '|' + to_api_path, error, nullptr, 0U);
|
||||||
|
if (ret == FspNtStatusFromWin32(ERROR_FILE_EXISTS)) {
|
||||||
|
ret = FspNtStatusFromWin32(ERROR_ALREADY_EXISTS);
|
||||||
|
} else if (ret == STATUS_OBJECT_NAME_EXISTS) {
|
||||||
|
ret = STATUS_ACCESS_DENIED;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
};
|
};
|
||||||
|
|
||||||
bool exists{};
|
bool exists{};
|
||||||
|
@ -141,7 +141,7 @@ protected:
|
|||||||
ASSERT_TRUE(utils::file::directory(cfg_directory).create_directory());
|
ASSERT_TRUE(utils::file::directory(cfg_directory).create_directory());
|
||||||
|
|
||||||
auto config =
|
auto config =
|
||||||
std::make_unique<app_config>(provider_type::s3, cfg_directory);
|
std::make_unique<app_config>(provider_type::sia, cfg_directory);
|
||||||
{
|
{
|
||||||
app_config src_cfg{
|
app_config src_cfg{
|
||||||
provider_type::sia,
|
provider_type::sia,
|
||||||
@ -299,10 +299,9 @@ std::string winfsp_test<provider_t>::mount_location;
|
|||||||
template <typename provider_t>
|
template <typename provider_t>
|
||||||
std::string winfsp_test<provider_t>::mount_location2;
|
std::string winfsp_test<provider_t>::mount_location2;
|
||||||
|
|
||||||
// using winfsp_provider_types = ::testing::Types<local_s3, remote_s3,
|
using winfsp_provider_types =
|
||||||
// local_sia, remote_sia>;
|
::testing::Types<local_s3, remote_s3, local_sia, remote_sia,
|
||||||
// using winfsp_provider_types = ::testing::Types<local_s3, remote_s3>;
|
remote_winfsp_to_linux>;
|
||||||
using winfsp_provider_types = ::testing::Types<remote_winfsp_to_linux>;
|
|
||||||
} // namespace repertory
|
} // namespace repertory
|
||||||
|
|
||||||
#endif // defined(_WIN32)
|
#endif // defined(_WIN32)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user