Update version

* Update dependencies

* Update to 0.4.7

README.md

@@ -8,7 +8,7 @@ Being a work in progress, be warned that this code is likely to corrupt drive im
 There are binaries [here](https://github.com/tjboldt/ProDOS-Utilities/releases/latest)
 
 ## Current TODO list
-1. Create/Delete directories
+1. Delete directories
 2. Add file/directory tests
 3. Add rename
 4. Add in-place file/directory moves

go.mod

@@ -2,4 +2,4 @@ module github.com/tjboldt/ProDOS-Utilities
 
 go 1.16
 
-require golang.org/x/image v0.3.0
+require golang.org/x/image v0.15.0

go.sum

@@ -1,26 +1,33 @@
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/image v0.3.0 h1:HTDXbdK9bjfSWkPzDJIw89W8CAtfFGduujWs33NLLsg=
-golang.org/x/image v0.3.0/go.mod h1:fXd9211C/0VTlYuAcOhW8dY/RtEJqODXOWBDpmYBf+A=
+golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
+golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

main.go

@@ -17,7 +17,7 @@ import (
 	"github.com/tjboldt/ProDOS-Utilities/prodos"
 )
 
-const version = "0.4.4"
+const version = "0.4.9"
 
 func main() {
 	var fileName string
@@ -82,7 +82,7 @@ func main() {
 
 func dumpFile(fileName string, pathName string) {
 	checkPathName(pathName)
-	file, err := os.OpenFile(fileName, os.O_RDWR, 0755)
+	file, err := os.OpenFile(fileName, os.O_RDONLY, 0755)
 	if err != nil {
 		fmt.Printf("Failed to open drive image %s:\n  %s", fileName, err)
 		os.Exit(1)
@@ -94,7 +94,7 @@ func dumpFile(fileName string, pathName string) {
 
 func dumpDirectory(fileName string, pathName string) {
 	checkPathName(pathName)
-	file, err := os.OpenFile(fileName, os.O_RDWR, 0755)
+	file, err := os.OpenFile(fileName, os.O_RDONLY, 0755)
 	if err != nil {
 		fmt.Printf("Failed to open drive image %s:\n  %s", fileName, err)
 		os.Exit(1)
@@ -176,7 +176,7 @@ func writeBlock(blockNumber int, fileName string, inFileName string) {
 
 func readBlock(blockNumber int, fileName string) {
 	fmt.Printf("Reading block 0x%04X (%d):\n\n", blockNumber, blockNumber)
-	file, err := os.OpenFile(fileName, os.O_RDWR, 0755)
+	file, err := os.OpenFile(fileName, os.O_RDONLY, 0755)
 	if err != nil {
 		fmt.Printf("Failed to open drive image %s:\n  %s", fileName, err)
 		os.Exit(1)
@@ -209,7 +209,7 @@ func put(fileName string, pathName string, fileType int, auxType int, inFileName
 
 func get(fileName string, pathName string, outFileName string) {
 	checkPathName(pathName)
-	file, err := os.OpenFile(fileName, os.O_RDWR, 0755)
+	file, err := os.OpenFile(fileName, os.O_RDONLY, 0755)
 	if err != nil {
 		fmt.Printf("Failed to open drive image %s:\n  %s", fileName, err)
 		os.Exit(1)
@@ -236,7 +236,7 @@ func get(fileName string, pathName string, outFileName string) {
 }
 
 func ls(fileName string, pathName string) {
-	file, err := os.OpenFile(fileName, os.O_RDWR, 0755)
+	file, err := os.OpenFile(fileName, os.O_RDONLY, 0755)
 	if err != nil {
 		fmt.Printf("Failed to open drive image %s:\n  %s", fileName, err)
 		os.Exit(1)

prodos/basic.go

@@ -190,6 +190,9 @@ func ConvertTextToBasic(text string) ([]byte, error) {
 
 		// skip initial whitespace and look for the start of a line number
 		if starting {
+			if c == '\n' { // skip blank lines
+				continue
+			}
 			if c == ' ' {
 				continue
 			}
@@ -230,6 +233,7 @@ func ConvertTextToBasic(text string) ([]byte, error) {
 				parsingRem = false
 				parsingString = false
 				foundToken = false
+				skipChars = 0
 				currentByte += basicLine.Len()
 				currentByte += 3
 				// write address of next line