From 1f242823d0933b7041a910d7e4cdfc5f5447d1e2 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Wed, 17 Apr 2024 13:58:59 +0200
Subject: [PATCH] system: make sys_object::duplicate public

It's useful to clone std handles when creating streams to write/read to
standard streams. As the stream we give handle to assumes the handle
ownership, it'd close the std handles in stream destructor.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 include/stdex/system.hpp | 42 ++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/include/stdex/system.hpp b/include/stdex/system.hpp
index 890036053..763bb5245 100644
--- a/include/stdex/system.hpp
+++ b/include/stdex/system.hpp
@@ -100,14 +100,14 @@ namespace stdex
 	public:
 		sys_object(_In_opt_ sys_handle h = invalid_handle) : m_h(h) {}
 
-		sys_object(_In_ const sys_object& other) : m_h(other.m_h != invalid_handle ? duplicate(other.m_h, false) : invalid_handle) {}
+		sys_object(_In_ const sys_object& other) : m_h(other.m_h != invalid_handle ? duplicate(other.m_h) : invalid_handle) {}
 
 		sys_object& operator =(_In_ const sys_object& other)
 		{
 			if (this != std::addressof(other)) {
 				if (m_h != invalid_handle)
 					close(m_h);
-				m_h = other.m_h != invalid_handle ? duplicate(other.m_h, false) : invalid_handle;
+				m_h = other.m_h != invalid_handle ? duplicate(other.m_h) : invalid_handle;
 			}
 			return *this;
 		}
@@ -155,6 +155,25 @@ namespace stdex
 		///
 		sys_handle get() const noexcept { return m_h; }
 
+		///
+		/// Duplicates given object
+		///
+		static sys_handle duplicate(_In_ sys_handle h, _In_ bool inherit = false)
+		{
+			sys_handle h_new;
+#ifdef _WIN32
+			HANDLE process = GetCurrentProcess();
+			if (DuplicateHandle(process, h, process, &h_new, 0, inherit, DUPLICATE_SAME_ACCESS))
+				return h_new;
+			throw std::system_error(GetLastError(), std::system_category(), "DuplicateHandle failed");
+#else
+			_Unreferenced_(inherit);
+			if ((h_new = dup(h)) >= 0)
+				return h_new;
+			throw std::system_error(errno, std::system_category(), "dup failed");
+#endif
+		}
+
 	protected:
 		///
 		/// Closes object
@@ -172,25 +191,6 @@ namespace stdex
 #endif
 		}
 
-		///
-		/// Duplicates given object
-		///
-		static sys_handle duplicate(_In_ sys_handle h, _In_ bool inherit)
-		{
-			sys_handle h_new;
-#ifdef _WIN32
-			HANDLE process = GetCurrentProcess();
-			if (DuplicateHandle(process, h, process, &h_new, 0, inherit, DUPLICATE_SAME_ACCESS))
-				return h_new;
-			throw std::system_error(GetLastError(), std::system_category(), "DuplicateHandle failed");
-#else
-			_Unreferenced_(inherit);
-			if ((h_new = dup(h)) >= 0)
-				return h_new;
-			throw std::system_error(errno, std::system_category(), "dup failed");
-#endif
-		}
-
 	protected:
 		sys_handle m_h;
 	};