WIP

Author: iseki0

build-logic/src/main/kotlin/kotlinx/io/conventions/kotlinx-io-multiplatform.gradle.kts

@@ -97,6 +97,10 @@ kotlin {
                         group("androidNative")
                     }
                 }
+                group("appleAndLinux") {
+                    group("apple")
+                    group("linux")
+                }
             }
             group("nodeFilesystemShared") {
                 withJs()

core/apple/src/files/FileSystemApple.kt

@@ -6,10 +6,8 @@
 
 package kotlinx.io.files
 
-import kotlinx.cinterop.CPointer
 import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.cstr
-import kotlinx.cinterop.get
 import kotlinx.cinterop.memScoped
 import kotlinx.cinterop.toKString
 import kotlinx.io.IOException
@@ -19,9 +17,7 @@ import platform.Foundation.NSFileType
 import platform.Foundation.NSFileTypeDirectory
 import platform.Foundation.NSFileTypeRegular
 import platform.Foundation.NSTemporaryDirectory
-import platform.posix.DIR
 import platform.posix.basename
-import platform.posix.closedir
 import platform.posix.dirname
 import platform.posix.errno
 import platform.posix.free
@@ -84,29 +80,3 @@ internal actual fun metadataOrNullImpl(path: Path): FileMetadata? {
     )
 }
 
-@OptIn(ExperimentalForeignApi::class)
-internal actual class OpaqueDirEntry(private val dir: CPointer<DIR>) : AutoCloseable {
-    actual fun readdir(): String? {
-        val entry = platform.posix.readdir(dir) ?: return null
-        return entry[0].d_name.toKString()
-    }
-
-    actual override fun close() {
-        if (closedir(dir) != 0) {
-            val err = errno
-            val strerr = strerror(err)?.toKString() ?: "unknown error"
-            throw IOException("closedir failed with errno $err ($strerr)")
-        }
-    }
-}
-
-@OptIn(ExperimentalForeignApi::class)
-internal actual fun opendir(path: String): OpaqueDirEntry {
-    val dirent = platform.posix.opendir(path)
-    if (dirent != null) return OpaqueDirEntry(dirent)
-
-    val err = errno
-    val strerr = strerror(err)?.toKString() ?: "unknown error"
-    throw IOException("Can't open directory $path: $err ($strerr)")
-}
-

core/appleAndLinux/src/files/FileSystemLinux.kt

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file.
+ */
+
+package kotlinx.io.files
+
+import kotlinx.cinterop.CPointer
+import kotlinx.cinterop.ExperimentalForeignApi
+import kotlinx.cinterop.get
+import kotlinx.cinterop.toKString
+import kotlinx.io.IOException
+import platform.posix.DIR
+import platform.posix.closedir
+import platform.posix.errno
+import platform.posix.opendir
+import platform.posix.strerror
+
+
+@OptIn(ExperimentalForeignApi::class)
+internal actual class OpaqueDirEntry(private val dir: CPointer<DIR>) : AutoCloseable {
+    actual fun readdir(): String? {
+        val entry = platform.posix.readdir(dir) ?: return null
+        return entry[0].d_name.toKString()
+    }
+
+    actual override fun close() {
+        if (closedir(dir) != 0) {
+            val err = errno
+            val strerr = strerror(err)?.toKString() ?: "unknown error"
+            throw IOException("closedir failed with errno $err ($strerr)")
+        }
+    }
+}
+
+@OptIn(ExperimentalForeignApi::class)
+internal actual fun opendir(path: String): OpaqueDirEntry {
+    val dirent = opendir(path)
+    if (dirent != null) return OpaqueDirEntry(dirent)
+
+    val err = errno
+    val strerr = strerror(err)?.toKString() ?: "unknown error"
+    throw IOException("Can't open directory $path: $err ($strerr)")
+}

core/linux/src/files/FileSystemLinux.kt

@@ -5,19 +5,12 @@
 
 package kotlinx.io.files
 
-import kotlinx.cinterop.CPointer
 import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.cstr
-import kotlinx.cinterop.get
 import kotlinx.cinterop.memScoped
 import kotlinx.cinterop.toKString
-import kotlinx.io.IOException
-import platform.posix.DIR
 import platform.posix.__xpg_basename
-import platform.posix.closedir
 import platform.posix.dirname
-import platform.posix.errno
-import platform.posix.strerror
 
 @OptIn(ExperimentalForeignApi::class)
 internal actual fun dirnameImpl(path: String): String {
@@ -38,29 +31,3 @@ internal actual fun basenameImpl(path: String): String {
 
 internal actual fun isAbsoluteImpl(path: String): Boolean = path.startsWith('/')
 
-
-@OptIn(ExperimentalForeignApi::class)
-internal actual class OpaqueDirEntry(private val dir: CPointer<DIR>) : AutoCloseable {
-    actual fun readdir(): String? {
-        val entry = platform.posix.readdir(dir) ?: return null
-        return entry[0].d_name.toKString()
-    }
-
-    actual override fun close() {
-        if (closedir(dir) != 0) {
-            val err = errno
-            val strerr = strerror(err)?.toKString() ?: "unknown error"
-            throw IOException("closedir failed with errno $err ($strerr)")
-        }
-    }
-}
-
-@OptIn(ExperimentalForeignApi::class)
-internal actual fun opendir(path: String): OpaqueDirEntry {
-    val dirent = platform.posix.opendir(path)
-    if (dirent != null) return OpaqueDirEntry(dirent)
-
-    val err = errno
-    val strerr = strerror(err)?.toKString() ?: "unknown error"
-    throw IOException("Can't open directory $path: $err ($strerr)")
-}