symbols: m_fd is now only needed on macos

Signed-off-by: Martin Olivier <[email protected]>
martin-olivier · Jan 6, 2025 · 4d09beb · 4d09beb
1 parent 6e9ca66
commit 4d09beb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/include/dylib.hpp b/include/dylib.hpp
@@ -248,7 +248,7 @@ class library {
 
 protected:
     native_handle_type m_handle{nullptr};
-#if !defined(_WIN32)
+#if defined(__APPLE__)
     int m_fd{-1};
 #endif
 };

diff --git a/src/dylib.cpp b/src/dylib.cpp
@@ -72,15 +72,15 @@ static std::string get_error_description() noexcept {
 
 library::library(library &&other) noexcept {
     std::swap(m_handle, other.m_handle);
-#if !defined(_WIN32)
+#if defined(__APPLE__)
     std::swap(m_fd, other.m_fd);
 #endif
 }
 
 library &library::operator=(library &&other) noexcept {
     if (this != &other) {
         std::swap(m_handle, other.m_handle);
-#if !defined(_WIN32)
+#if defined(__APPLE__)
         std::swap(m_fd, other.m_fd);
 #endif
     }
@@ -120,7 +120,7 @@ library::library(const char *lib_path, dylib::decorations decorations) {
     if (!m_handle)
         throw load_error("Could not load library '" + lib + "'\n" + get_error_description());
 
-#if !defined(_WIN32)
+#if defined(__APPLE__)
     m_fd = open(lib.c_str(), O_RDONLY);
     if (m_fd < 0)
         throw load_error("Could not open file '" + lib + "': " + strerror(errno));
@@ -138,7 +138,7 @@ library::library(const std::filesystem::path &lib_path, decorations decorations)
 library::~library() {
     if (m_handle)
         close_lib(m_handle);
-#if !defined(_WIN32)
+#if defined(__APPLE__)
     if (m_fd > -1)
         close(m_fd);
 #endif
@@ -213,7 +213,7 @@ std::vector<std::string> library::symbols(symbol_params params) const {
     try {
         return get_symbols(
             m_handle,
-            DYLIB_WIN_OTHER(-1, m_fd),
+            DYLIB_WIN_MAC_OTHER(-1, m_fd, -1),
             params.demangle,
             params.loadable
         );

diff --git a/src/symbols.cpp b/src/symbols.cpp
@@ -85,7 +85,6 @@ std::vector<std::string> get_symbols(HMODULE handle, int fd, bool demangle, bool
 #include <mach-o/nlist.h>
 #include <mach-o/fat.h>
 #include <dlfcn.h>
-#include <fcntl.h>
 #include <unistd.h>
 #include <utility>
 
@@ -243,6 +242,9 @@ std::vector<std::string> get_symbols(void *handle, int fd, bool demangle, bool l
             symentries = section->d_un.d_val;
     }
 
+    if (!symtab || !strtab || symentries == 0)
+        return result;
+
     size = strtab - (char *)symtab;
 
     for (int i = 0; i < size / symentries; ++i) {