Move OcHandle from vfs module to core Utility::Handle

2 files changed, 80 insertions, 0 deletions

diff --git a/src/common/utility.h b/src/common/utility.h
index 2490a338e..821c6d861 100644
--- a/src/common/utility.h
+++ b/src/common/utility.h
@@ -274,6 +274,59 @@ OCSYNC_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcUtility)
         Q_DISABLE_COPY(NtfsPermissionLookupRAII);
     };
 
+
+    class OCSYNC_EXPORT Handle
+    {
+    public:
+        /**
+         * A RAAI for Windows Handles
+         */
+        Handle() = default;
+        explicit Handle(HANDLE h);
+        explicit Handle(HANDLE h, std::function<void(HANDLE)> &&close);
+
+        Handle(const Handle &) = delete;
+        Handle &operator=(const Handle &) = delete;
+
+        Handle(Handle &&other)
+        {
+            std::swap(_handle, other._handle);
+            std::swap(_close, other._close);
+        }
+
+        Handle &operator=(Handle &&other)
+        {
+            if (this != &other) {
+                std::swap(_handle, other._handle);
+                std::swap(_close, other._close);
+            }
+            return *this;
+        }
+
+        ~Handle();
+
+        HANDLE &handle()
+        {
+            return _handle;
+        }
+
+        void close();
+
+        explicit operator bool() const
+        {
+            return _handle != INVALID_HANDLE_VALUE;
+        }
+
+        operator HANDLE() const
+        {
+            return _handle;
+        }
+
+    private:
+        HANDLE _handle = INVALID_HANDLE_VALUE;
+        std::function<void(HANDLE)> _close;
+    };
+
 #endif
 
     template <class E>
diff --git a/src/common/utility_win.cpp b/src/common/utility_win.cpp
index a76bf97ef..56002b01c 100644
--- a/src/common/utility_win.cpp
+++ b/src/common/utility_win.cpp
@@ -319,4 +319,31 @@ Utility::NtfsPermissionLookupRAII::~NtfsPermissionLookupRAII()
     qt_ntfs_permission_lookup--;
 }
 
+
+Utility::Handle::Handle(HANDLE h, std::function<void(HANDLE)> &&close)
+    : _handle(h)
+    , _close(std::move(close))
+{
+}
+
+Utility::Handle::Handle(HANDLE h)
+    : _handle(h)
+    , _close(&CloseHandle)
+{
+}
+
+Utility::Handle::~Handle()
+{
+    close();
+}
+
+void Utility::Handle::close()
+{
+    if (_handle != INVALID_HANDLE_VALUE) {
+        _close(_handle);
+        _handle = INVALID_HANDLE_VALUE;
+    }
+}
+
+
 } // namespace OCC