Adjust exception behavior

Author: FooBarWidget

src/cxx_supportlib/IOTools/IOUtils.cpp

@@ -29,6 +29,7 @@
 	// https://bugzilla.redhat.com/show_bug.cgi?id=165427
 	// Also needed for SO_PEERCRED.
 	#define _GNU_SOURCE
+#include <exception>
 #endif
 
 #include <oxt/system_calls.hpp>
@@ -672,13 +673,23 @@ FdGuard::FdGuard(int fd, const char *sourceFile, unsigned int sourceLine)
 	}
 }
 
-FdGuard::~FdGuard() {
+FdGuard::~FdGuard() noexcept(false) {
 	if (mFd != -1) {
 		try {
 			safelyClose(mFd);
 		} catch (const std::exception &e) {
-			P_WARN("Error closing file descriptor " << mFd << ": " << e.what());
-			return;
+			bool uncaughtException =
+				#if __cplusplus >= 201703L
+					std::uncaught_exceptions() > 0;
+				#else
+					std::uncaught_exception();
+				#endif
+			if (uncaughtException) {
+				P_WARN("Error closing file descriptor " << mFd << ": " << e.what());
+				return;
+			} else {
+				throw e;
+			}
 		}
 		P_LOG_FILE_DESCRIPTOR_CLOSE(mFd);
 	}
@@ -698,12 +709,12 @@ FdGuard::operator=(FdGuard &&other) {
 }
 
 void
-FdGuard::clear() {
+FdGuard::clear() noexcept {
 	mFd = -1;
 }
 
 void
-FdGuard::runNow() {
+FdGuard::runNow() noexcept(false) {
 	if (mFd != -1) {
 		safelyClose(mFd);
 		P_LOG_FILE_DESCRIPTOR_CLOSE(mFd);

src/cxx_supportlib/IOTools/IOUtils.h

@@ -370,16 +370,21 @@ class FdGuard {
 	FdGuard(const FdGuard &other) = delete;
 	FdGuard(FdGuard &&other);
 	FdGuard(int fd, const char *sourceFile, unsigned int sourceLine);
-	~FdGuard();
+	/** @throws SystemException File descriptor close error. If exception is already being thrown, then only warns. */
+	~FdGuard() noexcept(false);
 
 	FdGuard &operator=(const FdGuard &other) = delete;
 	FdGuard &operator=(FdGuard &&other);
 
 	/** Don't close file descriptor at object destruction. */
-	void clear();
+	void clear() noexcept;
 
-	/** Close file descriptor now. Idempotent. */
-	void runNow();
+	/**
+	 * Close file descriptor now. Idempotent.
+	 *
+	 * @throws SystemException
+	 */
+	void runNow() noexcept(false);
 };