Apple-2-Tools/diskm8
1
0
Fork 0
mirror of https://github.com/paleotronic/diskm8.git synced 2024-12-21 18:29:43 +00:00
Code Issues Projects Releases Wiki Activity

fix prodos file delete bug

Browse Source
This commit is contained in:
April Ayres-Griffiths 2018-06-27 17:57:09 +10:00
parent 358c50662f
commit e38cb58d37
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
disk/diskimagepd.go
View File

@ -2,7 +2,6 @@ package disk
import ( import (
"errors" "errors"
"fmt"
"regexp" "regexp"
"strings" "strings"
"time" "time"
@ -193,9 +192,9 @@ func (fd *VDH) Publish(dsk *DSKWrapper) error {
for i, v := range fd.Data { for i, v := range fd.Data {
bd[fd.blockoffset+i] = v bd[fd.blockoffset+i] = v
} }
fmt.Printf("Writing dir header at block %d\n", fd.blockid) //fmt.Printf("Writing dir header at block %d\n", fd.blockid)
fmt.Printf("Data=%v\n", bd) //fmt.Printf("Data=%v\n", bd)
return dsk.PRODOSWrite(fd.blockid, bd) return dsk.PRODOSWrite(fd.blockid, bd)
} }
@ -324,6 +323,9 @@ func (vb ProDOSVolumeBitmap) IsBlockFree(b int) bool {
} }
func (vb ProDOSVolumeBitmap) SetBlockFree(b int, free bool) { func (vb ProDOSVolumeBitmap) SetBlockFree(b int, free bool) {
//log.Printf("Freeing block %d", b)
bidx := b / 8 bidx := b / 8
bit := 7 - (b % 8) bit := 7 - (b % 8)
setmask := byte(1 << uint(bit)) setmask := byte(1 << uint(bit))
@ -1390,10 +1392,16 @@ func (dsk *DSKWrapper) PRODOSDeleteFile(path string, name string) error {
return err return err
} }
maxBlocks := 1600
if len(dsk.Data) == STD_DISK_BYTES {
maxBlocks = 280
}
i := 0 i := 0
b := int(ib[2*i+0]) + 256*int(ib[2*i+1]) b := int(ib[i]) + 256*int(ib[256+i])
for i < 256 && b != 0 { for i < 256 && b != 0 && b <= maxBlocks {
b = int(ib[2*i+0]) + 256*int(ib[2*i+1]) removeBlocks = append(removeBlocks, b)
b = int(ib[i]) + 256*int(ib[256+i])
i++ i++
} }
} }