AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-19 12:17:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed buffered file system allowing creation of files with names that could not be flushed to the host file system.

Browse Source
This commit is contained in:
Florian Nücke 2014-06-26 20:22:27 +02:00
parent b60bdb7c35
commit 12c1e74888
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/scala/li/cil/oc/server/fs/FileSystem.scala
View File

@ -4,7 +4,7 @@ import java.io
import java.net.URL
import li.cil.oc.api.driver.Container
import li.cil.oc.api.fs.Label
import li.cil.oc.api.fs.{Label, Mode}
import li.cil.oc.server.component
import li.cil.oc.util.mods.{ComputerCraft15, ComputerCraft16, Mods}
import li.cil.oc.{Settings, api}
@ -124,6 +124,26 @@ object FileSystem extends api.detail.FileSystemAPI {
private class BufferedFileSystem(protected val fileRoot: io.File, protected val capacity: Long)
extends VirtualFileSystem
with Buffered
with Capacity
with Capacity {
// Worst-case: we're on Windows or using a FAT32 partition mounted in *nix.
// Note: we allow / as the path separator and expect all \s to be converted
// accordingly before the path is passed to the file system.
private val invalidChars = """\:*?"<>|""".toSet
override def makeDirectory(path: String) = super.makeDirectory(validatePath(path))
override protected def openOutputHandle(id: Int, path: String, mode: Mode) = super.openOutputHandle(id, validatePath(path), mode)
private def validatePath(path: String) = {
if (path.exists(invalidChars.contains)) {
throw new java.io.IOException("path contains invalid characters")
}
// TODO Add fix for #338.
// If on a system with case insensitive file systems, check if path
// already exists, if so return that name instead (i.e. re-use the
// existing path, with exact same casing).
path
}
}
}