From 16c8a2100dd38a47b6a6916722e769ead158e8c6 Mon Sep 17 00:00:00 2001
From: April Ayres-Griffiths <aag6581@gmail.com>
Date: Sun, 6 Jan 2019 09:19:01 +1100
Subject: [PATCH] fix dos write

---
 data.go                   | 17 ++++++-----------
 disk/diskimageappledos.go | 23 +++++++++++++++--------
 main.go                   | 16 +++++-----------
 3 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/data.go b/data.go
index 6e76577..6074f0d 100644
--- a/data.go
+++ b/data.go
@@ -1,21 +1,16 @@
 package main
 
 import (
+	"crypto/md5"
+	"encoding/gob"
+	"encoding/hex"
 	"errors"
 	"fmt"
-	"runtime"
-	"time"
-
-	"crypto/md5"
-	"encoding/hex"
-
 	"os"
-
-	"strings"
-
-	"encoding/gob"
-
 	"path/filepath"
+	"runtime"
+	"strings"
+	"time"
 
 	"github.com/paleotronic/diskm8/disk"
 	"github.com/paleotronic/diskm8/loggy"
diff --git a/disk/diskimageappledos.go b/disk/diskimageappledos.go
index 3a628ef..a57963d 100644
--- a/disk/diskimageappledos.go
+++ b/disk/diskimageappledos.go
@@ -917,20 +917,19 @@ func (dsk *DSKWrapper) AppleDOSWriteFile(name string, kind FileType, data []byte
 		data = append(header, data...)
 	}
 
-	// 1st: check we have sufficient space...
-	tsBlocks, dataBlocks, err := dsk.AppleDOSGetFreeSectors(len(data))
-	if err != nil {
-		return err
-	}
-
+	// try get catalog entry - delete existing if match found
 	fd, err := dsk.AppleDOSNamedCatalogEntry(name)
-	//fmt.Println("FD=", fd)
 	if err == nil {
 		if kind != fd.Type() {
 			return errors.New("File type mismatch")
 		} else {
 			// need to delete this file...
-			err = dsk.AppleDOSDeleteFile(name)
+			err = dsk.AppleDOSRemoveFile(fd)
+			if err != nil {
+				return err
+			}
+			// reread vtoc here
+			vtoc, err = dsk.AppleDOSGetVTOC()
 			if err != nil {
 				return err
 			}
@@ -942,6 +941,12 @@ func (dsk *DSKWrapper) AppleDOSWriteFile(name string, kind FileType, data []byte
 		}
 	}
 
+	// 1st: check we have sufficient space...
+	tsBlocks, dataBlocks, err := dsk.AppleDOSGetFreeSectors(len(data))
+	if err != nil {
+		return err
+	}
+
 	// 2nd: check we can get a free catalog entry
 	sectorCount := len(dataBlocks)
 
@@ -1058,6 +1063,8 @@ func (d *DSKWrapper) AppleDOSRemoveFile(fd *FileDescriptor) error {
 		vtoc.SetTSFree(pair[0], pair[1], true)
 	}
 
+	vtoc.Publish(d)
+
 	fd.Data[0x00] = 0xff
 	fd.SetName("")
 	return fd.Publish(d)
diff --git a/main.go b/main.go
index 508f0d4..143246c 100644
--- a/main.go
+++ b/main.go
@@ -13,25 +13,19 @@ through as time goes by.
 */
 
 import (
+	"flag"
 	"fmt"
 	"io/ioutil"
+	"os"
 	"path"
 	"path/filepath"
+	"runtime"
 	"runtime/debug"
-
-	"flag"
-
-	"os"
+	"strings"
+	"time"
 
 	"github.com/paleotronic/diskm8/disk"
 	"github.com/paleotronic/diskm8/loggy"
-
-	"runtime"
-
-	"strings"
-
-	"time"
-
 	"github.com/paleotronic/diskm8/panic"
 )