Merge pull request #1881 from contour-terminal/fix/alpine-linux-build

Fix build failure on Alpine Linux (musl libc)

Author: christianparpart

.github/actions/spelling/allow/allow.txt

@@ -11,6 +11,7 @@ FFFFFFFF
 FONTBOUNDINGBOX
 FreeBSD
 LASTEXITCODE
+RTX
 OPENCONSOLE
 OpenBSD
 RTX

metainfo.xml

@@ -107,6 +107,7 @@
     <release version="0.6.3" urgency="medium" type="development">
       <description>
         <ul>
+          <li>Fixes build failure on Alpine Linux (musl libc) due to missing close_range() function (#1879)</li>
           <li>Fixes Insert Replace Mode (IRM, CSI 4 h) not shifting text right on character insertion (#1877)</li>
           <li>Fixes Home/End key encoding in Kitty keyboard protocol (extended keyboard input generator)</li>
           <li>Fixes glyph scaling and vertical centering of colored emoji</li>

src/vtpty/CMakeLists.txt

@@ -57,6 +57,9 @@ if(LINUX)
 endif()
 
 if(UNIX)
+    include(CheckFunctionExists)
+    check_function_exists(close_range HAVE_CLOSE_RANGE)
+
     list(APPEND vtpty_LIBRARIES util)
     list(APPEND vtpty_SOURCES UnixPty.cpp UnixUtils.cpp)
     list(APPEND vtpty_SOURCES UnixPty.h UnixUtils.h)
@@ -71,6 +74,9 @@ set_target_properties(vtpty PROPERTIES CXX_CLANG_TIDY "${CLANG_TIDY_EXE}")
 if(CONTOUR_WITH_UTEMPTER)
     target_compile_definitions(vtpty PRIVATE UTEMPTER=1)
 endif()
+if(HAVE_CLOSE_RANGE)
+    target_compile_definitions(vtpty PRIVATE HAVE_CLOSE_RANGE)
+endif()
 if(_include_SshSession_module)
     target_compile_definitions(vtpty PUBLIC VTPTY_LIBSSH2=1)
 endif()

src/vtpty/Process_unix.cpp

@@ -80,7 +80,7 @@ namespace
 
     void closeAllFileDescriptorsAbove(int keepFd)
     {
-#if defined(__linux__) || defined(__FreeBSD__)
+#if defined(HAVE_CLOSE_RANGE)
         if (close_range(keepFd + 1, ~0U, 0) == 0)
             return;
 #endif