curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-03-07 19:51:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

writing to nonexistent file will create the file

Browse Source
This commit is contained in:
minjaesong
2022-12-18 03:13:16 +09:00
parent 5fa195800c
commit 7ebd0a329b
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tsvm_core/src/net/torvald/tsvm/peripheral/TevdDiskDrive.kt
View File

@@ -49,6 +49,7 @@ class TevdDiskDrive(private val vm: VM, private val driveNum: Int, private val t
Thread {
while (vm.isRunning) {
println("TevdCommitWatchdog ping")
if (hasChanges.compareAndExchangeAcquire(true, false)) {
printdbg("Disk has changes, committing... $theTevdPath")
commit()
@@ -118,6 +119,8 @@ class TevdDiskDrive(private val vm: VM, private val driveNum: Int, private val t
* Disk drive must create desired side effects in accordance with the input message.
*/
override fun writeoutImpl(inputData: ByteArray) {
println("[TevDiskDrive] inputString=${inputData.trimNull().toString(VM.CHARSET)}")
if (writeMode || appendMode) {
//println("[DiskDrive] writeout with inputdata length of ${inputData.size}")
//println("[DiskDriveMsg] ${inputData.toString(Charsets.UTF_8)}")
@@ -137,14 +140,13 @@ class TevdDiskDrive(private val vm: VM, private val driveNum: Int, private val t
writeMode = false
appendMode = false
hasChanges.getAndSet(true)
printdbg("Raising HasChanges flag (end of write)")
hasChanges.set(true)
}
}
else {
val inputString = inputData.trimNull().toString(VM.CHARSET)
println("[TevDiskDrive] inputString=$inputString")
if (inputString.startsWith("DEVRST\u0017")) {
printdbg("Device Reset")
//readModeLength = -1
@@ -227,7 +229,8 @@ class TevdDiskDrive(private val vm: VM, private val driveNum: Int, private val t
}
try {
file.delete()
hasChanges.getAndSet(true)
printdbg("Raising HasChanges flag (file deleted)")
hasChanges.set(true)
}
catch (e: SecurityException) {
statusCode.set(TestDiskDrive.STATE_CODE_SYSTEM_SECURITY_ERROR)
@@ -361,7 +364,10 @@ class TevdDiskDrive(private val vm: VM, private val driveNum: Int, private val t
try {
val status = file.mkdir()
statusCode.set(if (status) 0 else 1)
if (status) hasChanges.getAndSet(true)
if (status) {
printdbg("Raising HasChanges flag (mkdir)")
hasChanges.set(true)
}
}
catch (e: SecurityException) {
statusCode.set(TestDiskDrive.STATE_CODE_SYSTEM_SECURITY_ERROR)
@@ -379,7 +385,10 @@ class TevdDiskDrive(private val vm: VM, private val driveNum: Int, private val t
try {
val f1 = file.createNewFile()
statusCode.set(if (f1) TestDiskDrive.STATE_CODE_STANDBY else TestDiskDrive.STATE_CODE_OPERATION_FAILED)
if (f1) hasChanges.getAndSet(true)
if (f1) {
printdbg("Raising HasChanges flag (mkfile)")
hasChanges.set(true)
}
return
}
catch (e: IOException) {
@@ -401,7 +410,10 @@ class TevdDiskDrive(private val vm: VM, private val driveNum: Int, private val t
try {
val f1 = file.setLastModified(vm.worldInterface.currentTimeInMills())
statusCode.set(if (f1) TestDiskDrive.STATE_CODE_STANDBY else TestDiskDrive.STATE_CODE_OPERATION_FAILED)
if (f1) hasChanges.getAndSet(true)
if (f1) {
printdbg("Raising HasChanges flag (touch)")
hasChanges.set(true)
}
return
}
catch (e: IOException) {
@@ -422,6 +434,11 @@ class TevdDiskDrive(private val vm: VM, private val driveNum: Int, private val t
}
if (fileOpenMode == 1) { writeMode = true; appendMode = false }
else if (fileOpenMode == 2) { writeMode = false; appendMode = true }
if (!file.exists()) {
val f1 = file.createNewFile()
statusCode.set(if (f1) TestDiskDrive.STATE_CODE_STANDBY else TestDiskDrive.STATE_CODE_OPERATION_FAILED)
if (!f1) { return }
}
writeModeLength = inputString.substring(5, inputString.length).toInt()
writeBuffer = ByteArray(writeModeLength)
writeBufferUsage = 0
@@ -432,7 +449,6 @@ class TevdDiskDrive(private val vm: VM, private val driveNum: Int, private val t
}
}
private fun sanitisePath(s: String) = s.replace('\\','/').replace(Regex("""\?<>:\*\|"""),"-")
// applies a "cap" if the path attemps to access parent directory of the root