Make sure zip filesystems are closed on exit

konan/utils/src/org/jetbrains/kotlin/konan/file/File.kt

@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.konan.file
 import java.io.BufferedReader
 import java.io.InputStream
 import java.io.InputStreamReader
-import java.net.URI
 import java.nio.file.*
 import java.nio.file.attribute.BasicFileAttributes
 
@@ -164,37 +163,6 @@ fun Path.File(): File = File(this)
 fun createTempFile(name: String, suffix: String? = null) = Files.createTempFile(name, suffix).File()
 fun createTempDir(name: String): File = Files.createTempDirectory(name).File()
 
-private val File.zipUri: URI
-    get() = URI.create("jar:${this.toPath().toUri()}")
-
-fun File.zipFileSystem(mutable: Boolean = false): FileSystem {
-    val zipUri = this.zipUri
-    val attributes = hashMapOf("create" to mutable.toString())
-    return try {
-        FileSystems.newFileSystem(zipUri, attributes, null)
-    } catch (e: FileSystemAlreadyExistsException) {
-        FileSystems.getFileSystem(zipUri)
-    }
-}
-
-fun File.mutableZipFileSystem() = this.zipFileSystem(mutable = true)
-
-fun File.zipPath(path: String): Path = this.zipFileSystem().getPath(path)
-
-val File.asZipRoot: File
-    get() = File(this.zipPath("/"))
-
-val File.asWritableZipRoot: File
-    get() = File(this.mutableZipFileSystem().getPath("/"))
-
-private fun File.toPath() = Paths.get(this.path)
-
-fun File.zipDirAs(unixFile: File) {
-    val zipRoot = unixFile.asWritableZipRoot
-    this.recursiveCopyTo(zipRoot)
-    zipRoot.javaPath.fileSystem.close()
-}
-
 fun Path.recursiveCopyTo(destPath: Path) {
     val sourcePath = this
     Files.walk(sourcePath).forEach next@{ oldPath ->
@@ -235,11 +203,3 @@ inline fun <T : AutoCloseable?, R> T.use(block: (T) -> R): R {
         }
     }
 }
-
-fun Path.unzipTo(directory: Path) {
-    val zipUri = URI.create("jar:" + this.toUri())
-    FileSystems.newFileSystem(zipUri, emptyMap<String, Any?>(), null).use { zipfs ->
-        val zipPath = zipfs.getPath("/")
-        zipPath.recursiveCopyTo(directory)
-    }
-}

konan/utils/src/org/jetbrains/kotlin/konan/file/ZipUtil.kt

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.konan.file
+
+import java.net.URI
+import java.nio.file.*
+
+private val File.zipUri: URI
+    get() = URI.create("jar:${this.toPath().toUri()}")
+
+fun File.zipFileSystem(mutable: Boolean = false): FileSystem {
+    val zipUri = this.zipUri
+    val attributes = hashMapOf("create" to mutable.toString())
+    return try {
+        FileSystems.newFileSystem(zipUri, attributes, null)
+    } catch (e: FileSystemAlreadyExistsException) {
+        FileSystems.getFileSystem(zipUri)
+    }
+}
+
+fun FileSystem.file(file: File) = File(this.getPath(file.path))
+
+fun FileSystem.file(path: String) = File(this.getPath(path))
+
+private fun File.toPath() = Paths.get(this.path)
+
+fun File.zipDirAs(unixFile: File) {
+    unixFile.withMutableZipFileSystem {
+        this.recursiveCopyTo(it.file("/"))
+    }
+}
+
+fun Path.unzipTo(directory: Path) {
+    val zipUri = URI.create("jar:" + this.toUri())
+    FileSystems.newFileSystem(zipUri, emptyMap<String, Any?>(), null).use { zipfs ->
+        val zipPath = zipfs.getPath("/")
+        zipPath.recursiveCopyTo(directory)
+    }
+}
+
+fun <T> File.withZipFileSystem(mutable: Boolean = false, action: (FileSystem) -> T): T {
+    val zipFileSystem = this.zipFileSystem(mutable)
+    return try {
+        action(zipFileSystem)
+    } finally {
+        zipFileSystem.close()
+    }
+}
+
+fun <T> File.withZipFileSystem(action: (FileSystem) -> T): T = this.withZipFileSystem(false, action)
+
+fun <T> File.withMutableZipFileSystem(action: (FileSystem) -> T): T = this.withZipFileSystem(true, action)