Specify variadic arguments for ffm ioctl call (#240)

Fixes #238
ajalt · Oct 29, 2024 · 45baa5b · 45baa5b
1 parent aab4a28
commit 45baa5b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/.../src/jvmMain/kotlin/com/github/ajalt/mordant/terminal/terminalinterface/ffm/FfmLayouts.kt b/.../src/jvmMain/kotlin/com/github/ajalt/mordant/terminal/terminalinterface/ffm/FfmLayouts.kt
@@ -152,6 +152,7 @@ internal abstract class MethodHandlesHolder(
     protected fun handle(
         resLayout: MemoryLayout,
         vararg argLayouts: MemoryLayout,
+        linkerOptions: Array<Linker.Option> = emptyArray(),
     ) =
         PropertyDelegateProvider<MethodHandlesHolder, ReadOnlyProperty<Any?, MethodHandle>> { _, property ->
             val name = property.name
@@ -160,7 +161,8 @@ internal abstract class MethodHandlesHolder(
                     .map {
                         linker.downcallHandle(
                             it,
-                            FunctionDescriptor.of(resLayout, *argLayouts)
+                            FunctionDescriptor.of(resLayout, *argLayouts),
+                            *linkerOptions
                         )
                     }
                     .orElseThrow()

diff --git a/...in/com/github/ajalt/mordant/terminal/terminalinterface/ffm/TerminalInterface.ffm.linux.kt b/...in/com/github/ajalt/mordant/terminal/terminalinterface/ffm/TerminalInterface.ffm.linux.kt
@@ -3,6 +3,7 @@ package com.github.ajalt.mordant.terminal.terminalinterface.ffm
 import com.github.ajalt.mordant.rendering.Size
 import com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfaceJvmPosix
 import java.lang.foreign.Arena
+import java.lang.foreign.Linker
 import java.lang.foreign.MemorySegment
 
 @Suppress("ClassName", "PropertyName", "SpellCheckingInspection")
@@ -51,9 +52,13 @@ private class LinuxCLibrary {
 
     object MethodHandles : MethodHandlesHolder() {
         val isatty by handle(Layouts.INT, Layouts.INT)
-        val ioctl by handle(Layouts.INT, Layouts.INT, Layouts.LONG, Layouts.POINTER)
         val tcgetattr by handle(Layouts.INT, Layouts.INT, Layouts.POINTER)
         val tcsetattr by handle(Layouts.INT, Layouts.INT, Layouts.INT, Layouts.POINTER)
+        val ioctl by handle(
+            Layouts.INT, Layouts.INT, Layouts.LONG, Layouts.POINTER, linkerOptions = arrayOf(
+                Linker.Option.firstVariadicArg(2)
+            )
+        )
     }
 
     fun isatty(fd: Int): Boolean {

diff --git a/...in/com/github/ajalt/mordant/terminal/terminalinterface/ffm/TerminalInterface.ffm.macos.kt b/...in/com/github/ajalt/mordant/terminal/terminalinterface/ffm/TerminalInterface.ffm.macos.kt
@@ -3,6 +3,7 @@ package com.github.ajalt.mordant.terminal.terminalinterface.ffm
 import com.github.ajalt.mordant.rendering.Size
 import com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfaceJvmPosix
 import java.lang.foreign.Arena
+import java.lang.foreign.Linker
 import java.lang.foreign.MemorySegment
 
 @Suppress("ClassName", "PropertyName", "SpellCheckingInspection")
@@ -43,9 +44,13 @@ private class MacosCLibrary {
 
     object MethodHandles : MethodHandlesHolder() {
         val isatty by handle(Layouts.INT, Layouts.INT)
-        val ioctl by handle(Layouts.INT, Layouts.INT, Layouts.LONG, Layouts.POINTER)
         val tcgetattr by handle(Layouts.INT, Layouts.INT, Layouts.POINTER)
         val tcsetattr by handle(Layouts.INT, Layouts.INT, Layouts.INT, Layouts.POINTER)
+        val ioctl by handle(
+            Layouts.INT, Layouts.INT, Layouts.LONG, Layouts.POINTER, linkerOptions = arrayOf(
+                Linker.Option.firstVariadicArg(2)
+            )
+        )
     }
 
     fun isatty(fd: Int): Boolean {
@@ -69,10 +74,7 @@ internal class TerminalInterfaceFfmMacos : TerminalInterfaceJvmPosix() {
     override val termiosConstants: TermiosConstants get() = MacosTermiosConstants
 
     private companion object {
-        val TIOCGWINSZ = when (System.getProperty("os.arch")) {
-            "x86", "amd64" -> 0x00005413
-            else -> 0x40087468
-        }
+        const val TIOCGWINSZ = 0x40087468
         const val TCSADRAIN: Int = 0x1
     }