From b800989c6d8b8cc7fa00a8bdc9a61ff10b179101 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Fri, 23 Dec 2022 17:33:03 +0900
Subject: [PATCH] bootloader write fix

---
 assets/DOSBOOT.tevd                           | Bin 130830 -> 130830 bytes
 assets/DOSBOOT.tevd.original                  | Bin 130830 -> 130830 bytes
 .../torvald/tsvm/peripheral/TevdDiskDrive.kt  |  12 ++++++++----
 .../net/torvald/tsvm/BuildTvdosBootable.kt    |   2 ++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/assets/DOSBOOT.tevd b/assets/DOSBOOT.tevd
index e564ad38a38f710ba624bcd59cf0e008b6a9a8ca..147c1ecd7f90e24b6d76e533bafc488a5d3120b1 100644
GIT binary patch
delta 981
zcmeDC$KLmkeS#Lt_Hzq<ZPepsR9>1|z`&3UBwMUboMd3uw3V2?(d+857j>!&7#J8B
zL3nc<BMT!ZT;b+yCN2Svwl8`HuAQtuH}{C6NY0dq;O3Yj@%SFdr0pgXP_%A$oXDud
z!|`wC%*i0V+h<-!m0os(@f$k}$o}nB*BCh%#o?A-VtU`pz;LYWcokUV7h_b7jHZka
zm<62n@`ByOn3|GVqL)=X{i6lrAB4lVxB4(T*>P+&&awd;qIea>km-8Y7(Il=c05@D
zl4UH&NvzDxF9RAg(eVctD1;#4w7qBn<2ebAF7<#-U{f5wqnNVY?+4>9HX)_T)&#II
zDMguOsl{MZej%JPy=flfZ6V(&2f0AO#8_G!Us#@6R8l$JegfkUZg6}+Z40yph8PPd
zI<|i|1O^F`863upPdE}?ESG}J*!)u&B_7yRkM?m)lylexj)#I>sE(}N%~&EK@cV+n
zSFj^Xib_*q;iUlgX<((Z8ZiDD7&wbkOG=CK6b!7vHbshYFq*<u1?>6tgMk%f49GT+
zb3m~V^4j{i%1>b9(?QyE(8FN+#)pj0S%epCSUV4_DmgzlH!&{-BfvL5*dkKP4KyEQ
zIa5+*-eg9W|A~kQ$(R|ngh2q59zp&AB@vL3ON>R2fZ`IACP3*86d{Ih56k*aUakg8
z0U*a^<iy<u#iMlX9)6G<*coYwImO_>X!K_Mtqb=iMqn6PgS3IQl;oEtXMn;Fqy-T{
z+b4N2-eckb*$7g$eZe!-NLc%vv4@`n<WP|G=2{_?2<#F*&BOt6Az1JEE>yjDx)}pl
K*!}^*e@OsV)p!N~

delta 944
zcmeDC$KLmkeS#Lt#$7UJHtO**Dlgd{$H0&bB*i4tQW%(j8S(uHJ01GWb*h{r0|Nsi
z5HoC!V`O3Ege%;f&BP_ZaV<1Su;X8H#`e=+QDnE@_{Mmei3McN_Si^94n}Rb#@kEz
z|1q$FG*wh^3B7rl`}FXX?`40Q>Sw)9G0+2vZ>|+Wv8hWqf*Y(5WE^8in2Ud~UT|da
zM8{u9&Uw84XdlPntGW_k=kz3?I%j4gqev|?&^McJuHiuP#pG9OpKyfyKd%M0H_!~l
z-Z=9I%se0okiASvnR$~LS^h_WLJ1O9mVL2-3<4lmU(H-~2xJP#eo&C~d|W3f?d>d*
z9QgXFJ#Rvu*s|O{*<_3R{_R|EF3zr8uh;Y}w(7K3sg82SFObhc7Hpm~AI0{S3v_t+
zKng%EU@XZmP0pBp@hjs$grB#&JYu}Z#0#<rtR^)jvjn8%FE=<UA&%S}Y~y6d0kROJ
zX8Y=&r~$L%7h?bm2Pg)>Zg?ff!pIBvpxlimdp56KP{X*nTyYH-2goNNLpHCOi|o?L
zJLlcz0Qnd!_p2INZZmuBISCGs_rbRFKLFaU0yjUf(pe3Zv=}&xQcFsU@)QiML1_Zy
zlI<JpP#wD0p0PxN7ZlJSlNd{iN>jmpRYUSChIt0opb!VUYi<>?yC$!y_TUAjaFFdx
z8Tq-Xz_|S<jfmSzOz(Sv0SJsguyv_<n;%SNL`pcDEp)%JbAaL!?6C<^sIHwG&G?*!
s7Zl}S?K!E%#TYTO-TWD24?hPe9e`bUcPg?AH@}*;i;e9c5d4<}012guk^lez

diff --git a/assets/DOSBOOT.tevd.original b/assets/DOSBOOT.tevd.original
index e564ad38a38f710ba624bcd59cf0e008b6a9a8ca..147c1ecd7f90e24b6d76e533bafc488a5d3120b1 100644
GIT binary patch
delta 981
zcmeDC$KLmkeS#Lt_Hzq<ZPepsR9>1|z`&3UBwMUboMd3uw3V2?(d+857j>!&7#J8B
zL3nc<BMT!ZT;b+yCN2Svwl8`HuAQtuH}{C6NY0dq;O3Yj@%SFdr0pgXP_%A$oXDud
z!|`wC%*i0V+h<-!m0os(@f$k}$o}nB*BCh%#o?A-VtU`pz;LYWcokUV7h_b7jHZka
zm<62n@`ByOn3|GVqL)=X{i6lrAB4lVxB4(T*>P+&&awd;qIea>km-8Y7(Il=c05@D
zl4UH&NvzDxF9RAg(eVctD1;#4w7qBn<2ebAF7<#-U{f5wqnNVY?+4>9HX)_T)&#II
zDMguOsl{MZej%JPy=flfZ6V(&2f0AO#8_G!Us#@6R8l$JegfkUZg6}+Z40yph8PPd
zI<|i|1O^F`863upPdE}?ESG}J*!)u&B_7yRkM?m)lylexj)#I>sE(}N%~&EK@cV+n
zSFj^Xib_*q;iUlgX<((Z8ZiDD7&wbkOG=CK6b!7vHbshYFq*<u1?>6tgMk%f49GT+
zb3m~V^4j{i%1>b9(?QyE(8FN+#)pj0S%epCSUV4_DmgzlH!&{-BfvL5*dkKP4KyEQ
zIa5+*-eg9W|A~kQ$(R|ngh2q59zp&AB@vL3ON>R2fZ`IACP3*86d{Ih56k*aUakg8
z0U*a^<iy<u#iMlX9)6G<*coYwImO_>X!K_Mtqb=iMqn6PgS3IQl;oEtXMn;Fqy-T{
z+b4N2-eckb*$7g$eZe!-NLc%vv4@`n<WP|G=2{_?2<#F*&BOt6Az1JEE>yjDx)}pl
K*!}^*e@OsV)p!N~

delta 944
zcmeDC$KLmkeS#Lt#$7UJHtO**Dlgd{$H0&bB*i4tQW%(j8S(uHJ01GWb*h{r0|Nsi
z5HoC!V`O3Ege%;f&BP_ZaV<1Su;X8H#`e=+QDnE@_{Mmei3McN_Si^94n}Rb#@kEz
z|1q$FG*wh^3B7rl`}FXX?`40Q>Sw)9G0+2vZ>|+Wv8hWqf*Y(5WE^8in2Ud~UT|da
zM8{u9&Uw84XdlPntGW_k=kz3?I%j4gqev|?&^McJuHiuP#pG9OpKyfyKd%M0H_!~l
z-Z=9I%se0okiASvnR$~LS^h_WLJ1O9mVL2-3<4lmU(H-~2xJP#eo&C~d|W3f?d>d*
z9QgXFJ#Rvu*s|O{*<_3R{_R|EF3zr8uh;Y}w(7K3sg82SFObhc7Hpm~AI0{S3v_t+
zKng%EU@XZmP0pBp@hjs$grB#&JYu}Z#0#<rtR^)jvjn8%FE=<UA&%S}Y~y6d0kROJ
zX8Y=&r~$L%7h?bm2Pg)>Zg?ff!pIBvpxlimdp56KP{X*nTyYH-2goNNLpHCOi|o?L
zJLlcz0Qnd!_p2INZZmuBISCGs_rbRFKLFaU0yjUf(pe3Zv=}&xQcFsU@)QiML1_Zy
zlI<JpP#wD0p0PxN7ZlJSlNd{iN>jmpRYUSChIt0opb!VUYi<>?yC$!y_TUAjaFFdx
z8Tq-Xz_|S<jfmSzOz(Sv0SJsguyv_<n;%SNL`pcDEp)%JbAaL!?6C<^sIHwG&G?*!
s7Zl}S?K!E%#TYTO-TWD24?hPe9e`bUcPg?AH@}*;i;e9c5d4<}012guk^lez

diff --git a/tsvm_core/src/net/torvald/tsvm/peripheral/TevdDiskDrive.kt b/tsvm_core/src/net/torvald/tsvm/peripheral/TevdDiskDrive.kt
index 03963a8..8a39d73 100644
--- a/tsvm_core/src/net/torvald/tsvm/peripheral/TevdDiskDrive.kt
+++ b/tsvm_core/src/net/torvald/tsvm/peripheral/TevdDiskDrive.kt
@@ -1,8 +1,7 @@
 package net.torvald.tsvm.peripheral
 
-import net.torvald.terrarum.modulecomputers.virtualcomputer.tvd.EntryDirectory
-import net.torvald.terrarum.modulecomputers.virtualcomputer.tvd.VDUtil
-import net.torvald.terrarum.modulecomputers.virtualcomputer.tvd.toCanonicalString
+import net.torvald.terrarum.modulecomputers.virtualcomputer.tvd.*
+import net.torvald.terrarum.modulecomputers.virtualcomputer.tvd.VDUtil.checkReadOnly
 import net.torvald.tsvm.VM
 import java.io.*
 import java.util.*
@@ -127,7 +126,12 @@ class TevdDiskDrive(private val vm: VM, private val driveNum: Int, private val t
             val inputData = if (inputData.size != BLOCK_SIZE) ByteArray(BLOCK_SIZE) { if (it < inputData.size) inputData[it] else 0 }
             else inputData
 
-            file.writeBytes(inputData)
+            val creationTime = VDUtil.currentUnixtime
+            DOM.checkReadOnly()
+            val file = EntryFile(BLOCK_SIZE.toLong())
+            file.getContent().appendBytes(inputData)
+
+            DOM.entries[1] = DiskEntry(1, 1, "TEVDBOOT".toByteArray(VM.CHARSET), creationTime, creationTime, file)
 
             fileOpenMode = -1
 
diff --git a/tsvm_executable/src/net/torvald/tsvm/BuildTvdosBootable.kt b/tsvm_executable/src/net/torvald/tsvm/BuildTvdosBootable.kt
index 3b68357..5c51fea 100644
--- a/tsvm_executable/src/net/torvald/tsvm/BuildTvdosBootable.kt
+++ b/tsvm_executable/src/net/torvald/tsvm/BuildTvdosBootable.kt
@@ -43,6 +43,8 @@ fun main(args: Array<String>) {
         disk.checkReadOnly()
 //        disk.checkCapacity(4096)
 
+        it.parentEntryID = 1
+
         (it.contents as EntryFile).let { file ->
             val bytes = file.getContent()
             bytes.appendBytes(ByteArray(4096 - bytes.size.toInt()))