From 80d8d6f32f7d1207c2ba39028fac72971639a8b6 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Mon, 11 Nov 2024 18:38:47 -0600
Subject: [PATCH] fuse unit tests and fixes

---
 .../src/drives/fuse/fuse_drive.cpp            | 34 ++++++++++---------
 .../src/drives/fuse/fuse_drive_base.cpp       |  4 +--
 .../src/fuse_drive_create_and_open_test.cpp   |  6 ++--
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/repertory/librepertory/src/drives/fuse/fuse_drive.cpp b/repertory/librepertory/src/drives/fuse/fuse_drive.cpp
index 1ba016d5..3ce66361 100644
--- a/repertory/librepertory/src/drives/fuse/fuse_drive.cpp
+++ b/repertory/librepertory/src/drives/fuse/fuse_drive.cpp
@@ -121,16 +121,6 @@ auto fuse_drive::create_impl(std::string api_path, mode_t mode,
   auto is_exclusive = ((file_info->flags & O_EXCL) == O_EXCL);
   auto is_truncate_op = ((file_info->flags & O_TRUNC) == O_TRUNC);
 
-  if (((file_info->flags & O_WRONLY) != 0) ||
-      ((file_info->flags & O_RDWR) != 0)) {
-    auto res = provider_.is_file_writeable(api_path)
-                   ? api_error::success
-                   : api_error::permission_denied;
-    if (res != api_error::success) {
-      return res;
-    }
-  }
-
   auto res = check_parent_access(api_path, X_OK);
   if (res != api_error::success) {
     return res;
@@ -152,6 +142,12 @@ auto fuse_drive::create_impl(std::string api_path, mode_t mode,
     return res;
   }
 
+  if ((((file_info->flags & O_WRONLY) == O_WRONLY) ||
+       ((file_info->flags & O_RDWR) == O_RDWR)) &&
+      not provider_.is_file_writeable(api_path)) {
+    return api_error::permission_denied;
+  }
+
   if (is_create_op && is_directory_op) {
     return api_error::invalid_operation;
   }
@@ -162,17 +158,23 @@ auto fuse_drive::create_impl(std::string api_path, mode_t mode,
     return res;
   }
 
-  if (is_create_op) {
-    if (is_exclusive && file_exists) {
-      return api_error::item_exists;
-    }
-  } else {
-    bool dir_exists{};
+  bool dir_exists{};
+  if (not file_exists) {
     res = provider_.is_directory(api_path, dir_exists);
     if (res != api_error::success) {
       return res;
     }
+  }
 
+  if (is_create_op) {
+    if (dir_exists) {
+      return api_error::directory_exists;
+    }
+
+    if (is_exclusive && file_exists) {
+      return api_error::item_exists;
+    }
+  } else {
     if (not(is_directory_op ? dir_exists : file_exists)) {
       return (is_directory_op ? api_error::directory_not_found
                               : api_error::item_not_found);
diff --git a/repertory/librepertory/src/drives/fuse/fuse_drive_base.cpp b/repertory/librepertory/src/drives/fuse/fuse_drive_base.cpp
index e30fc77b..295ea60b 100644
--- a/repertory/librepertory/src/drives/fuse/fuse_drive_base.cpp
+++ b/repertory/librepertory/src/drives/fuse/fuse_drive_base.cpp
@@ -176,8 +176,8 @@ auto fuse_drive_base::check_parent_access(const std::string &api_path,
       for (auto parent = utils::path::get_parent_path(api_path);
            (ret == api_error::success) && not parent.empty();
            parent = utils::path::get_parent_path(parent)) {
-        if (((ret = check_access(parent, X_OK)) == api_error::success) &&
-            (parent == "/")) {
+        ret = check_access(parent, X_OK);
+        if ((ret == api_error::success) && (parent == "/")) {
           break;
         }
       }
diff --git a/repertory/repertory_test/src/fuse_drive_create_and_open_test.cpp b/repertory/repertory_test/src/fuse_drive_create_and_open_test.cpp
index 918b2b8c..03a453c6 100644
--- a/repertory/repertory_test/src/fuse_drive_create_and_open_test.cpp
+++ b/repertory/repertory_test/src/fuse_drive_create_and_open_test.cpp
@@ -456,8 +456,8 @@ TYPED_TEST(fuse_test, create_fails_with_excl_if_file_exists) {
   this->unlink_file_and_test(file_path);
 }
 
-// 3. O_CREAT|O_EXCL-Failure: EISDIR (Is a directory) if a directory exists
-// instead of a file.
+// 3. O_CREAT|O_EXCL-Failure: EEXIST (File exists) if the file or directory
+// already exists.
 TYPED_TEST(fuse_test, create_fails_with_excl_if_path_is_directory) {
   std::string dir_name{"create_test"};
   auto dir_path = this->create_directory_and_test(dir_name);
@@ -465,7 +465,7 @@ TYPED_TEST(fuse_test, create_fails_with_excl_if_path_is_directory) {
   auto handle = open(dir_path.c_str(), O_CREAT | O_EXCL, ACCESSPERMS);
   EXPECT_EQ(-1, handle);
 
-  EXPECT_EQ(EISDIR, errno);
+  EXPECT_EQ(EEXIST, errno);
 
   this->rmdir_and_test(dir_path);
 }