Add PosixDirectory and use it instead of expect/actual DIR functions.

Unfortunately we cannot typealias `DIR` in a shared source set. Because it is already a typealias on Linux.

Author: MohammedKHC

…idNativeMain/kotlin/okio/internal/DIR.kt …n/kotlin/okio/internal/PosixDirectory.ktokio/src/androidNativeMain/kotlin/okio/internal/DIR.kt renamed to okio/src/androidNativeMain/kotlin/okio/internal/PosixDirectory.kt okio/src/androidNativeMain/kotlin/okio/internal/DIR.kt renamed to okio/src/androidNativeMain/kotlin/okio/internal/PosixDirectory.kt

@@ -15,9 +15,17 @@
  */
 package okio.internal
 
-import kotlinx.cinterop.CValuesRef
+import okio.Closeable
+import okio.Path
+import platform.posix.closedir
+import platform.posix.opendir
+import platform.posix.readdir
 
-internal actual typealias DIR = cnames.structs.DIR
-internal actual fun opendir(path: String) = platform.posix.opendir(path)
-internal actual fun readdir(dir: CValuesRef<DIR>) = platform.posix.readdir(dir)
-internal actual fun closedir(dir: CValuesRef<DIR>) = platform.posix.closedir(dir)
+internal actual class PosixDirectory actual constructor(path: Path) : Closeable {
+  private val dir = opendir(path.toString())
+  actual val isInvalid get() = dir == null
+  actual fun nextEntry() = readdir(dir)
+  actual override fun close() {
+    closedir(dir) // Ignore errno from closedir.
+  }
+}

okio/src/nativeMain/kotlin/okio/PosixFileSystem.kt

@@ -15,15 +15,11 @@
  */
 package okio
 
-import kotlinx.cinterop.CPointer
 import kotlinx.cinterop.get
 import okio.Path.Companion.toPath
-import okio.internal.closedir
-import okio.internal.opendir
-import okio.internal.readdir
+import okio.internal.PosixDirectory
 import okio.internal.toPath
 import platform.posix.EEXIST
-import platform.posix.dirent
 import platform.posix.errno
 import platform.posix.set_posix_errno
 
@@ -40,16 +36,17 @@ internal object PosixFileSystem : FileSystem() {
   override fun listOrNull(dir: Path): List<Path>? = list(dir, throwOnFailure = false)
 
   private fun list(dir: Path, throwOnFailure: Boolean): List<Path>? {
-    val opendir = opendir(dir.toString())
-      ?: if (throwOnFailure) throw errnoToIOException(errno) else return null
-
-    try {
+    val posixDir = PosixDirectory(dir)
+    if (posixDir.isInvalid) {
+      if (throwOnFailure) throw errnoToIOException(errno) else return null
+    }
+    posixDir.use {
       val result = mutableListOf<Path>()
       val buffer = Buffer()
 
       set_posix_errno(0) // If readdir() returns null it's either the end or an error.
       while (true) {
-        val dirent: CPointer<dirent> = readdir(opendir) ?: break
+        val dirent = it.nextEntry() ?: break
         val childPath = buffer.writeNullTerminated(
           bytes = dirent[0].d_name,
         ).toPath(normalize = true)
@@ -71,8 +68,6 @@ internal object PosixFileSystem : FileSystem() {
 
       result.sort()
       return result
-    } finally {
-      closedir(opendir) // Ignore errno from closedir.
     }
   }
 

…c/nativeMain/kotlin/okio/internal/DIR.kt …n/kotlin/okio/internal/PosixDirectory.ktokio/src/nativeMain/kotlin/okio/internal/DIR.kt renamed to okio/src/nativeMain/kotlin/okio/internal/PosixDirectory.kt okio/src/nativeMain/kotlin/okio/internal/DIR.kt renamed to okio/src/nativeMain/kotlin/okio/internal/PosixDirectory.kt

@@ -15,20 +15,21 @@
  */
 package okio.internal
 
-import kotlinx.cinterop.CPointed
 import kotlinx.cinterop.CPointer
-import kotlinx.cinterop.CValuesRef
+import okio.Closeable
+import okio.Path
 import platform.posix.dirent
 
 /**
  * `platform.posix.DIR` is not available on Android Native, so the standard
  * POSIX directory APIs (`opendir`, `readdir`, `closedir`) cannot be used
  * directly.
  *
- * These expect declarations provide platform-specific implementations
- * for all `DIR`-related functionality.
+ * [PosixDirectory] provides platform-specific implementation
+ * for `DIR`-related functionality.
  */
-internal expect class DIR : CPointed
-internal expect fun opendir(path: String): CPointer<DIR>?
-internal expect fun readdir(dir: CValuesRef<DIR>): CPointer<dirent>?
-internal expect fun closedir(dir: CValuesRef<DIR>): Int
+internal expect class PosixDirectory(path: Path) : Closeable {
+  val isInvalid: Boolean
+  fun nextEntry(): CPointer<dirent>?
+  override fun close()
+}

…nAndroidMain/kotlin/okio/internal/DIR.kt …n/kotlin/okio/internal/PosixDirectory.ktokio/src/nativeNonAndroidMain/kotlin/okio/internal/DIR.kt renamed to okio/src/nativeNonAndroidMain/kotlin/okio/internal/PosixDirectory.kt okio/src/nativeNonAndroidMain/kotlin/okio/internal/DIR.kt renamed to okio/src/nativeNonAndroidMain/kotlin/okio/internal/PosixDirectory.kt

@@ -15,9 +15,17 @@
  */
 package okio.internal
 
-import kotlinx.cinterop.CValuesRef
+import okio.Closeable
+import okio.Path
+import platform.posix.closedir
+import platform.posix.opendir
+import platform.posix.readdir
 
-internal actual typealias DIR = platform.posix.DIR
-internal actual fun opendir(path: String) = platform.posix.opendir(path)
-internal actual fun readdir(dir: CValuesRef<DIR>) = platform.posix.readdir(dir)
-internal actual fun closedir(dir: CValuesRef<DIR>) = platform.posix.closedir(dir)
+internal actual class PosixDirectory actual constructor(path: Path) : Closeable {
+  private val dir = opendir(path.toString())
+  actual val isInvalid get() = dir == null
+  actual fun nextEntry() = readdir(dir)
+  actual override fun close() {
+    closedir(dir) // Ignore errno from closedir.
+  }
+}