diff --git a/cmd/catalog.go b/cmd/catalog.go index 955d349..af1010e 100644 --- a/cmd/catalog.go +++ b/cmd/catalog.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" "github.com/zellyn/diskii/lib/disk" - _ "github.com/zellyn/diskii/lib/dos33" + _ "github.com/zellyn/diskii/lib/dos3" _ "github.com/zellyn/diskii/lib/supermon" ) diff --git a/cmd/dump.go b/cmd/dump.go index 255c79a..9955671 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" "github.com/zellyn/diskii/lib/disk" - _ "github.com/zellyn/diskii/lib/dos33" + _ "github.com/zellyn/diskii/lib/dos3" _ "github.com/zellyn/diskii/lib/supermon" ) diff --git a/lib/dos33/dos33.go b/lib/dos3/dos3.go similarity index 98% rename from lib/dos33/dos33.go rename to lib/dos3/dos3.go index d5b1077..bba0c28 100644 --- a/lib/dos33/dos33.go +++ b/lib/dos3/dos3.go @@ -1,7 +1,8 @@ // Copyright © 2016 Zellyn Hunter -// Package dos33 contains routines for working with the on-disk structures of DOS 3.3. -package dos33 +// Package dos3 contains routines for working with the on-disk +// structures of Apple DOS 3. +package dos3 import ( "encoding/binary" @@ -465,8 +466,8 @@ type operator struct { var _ disk.Operator = operator{} // operatorName is the keyword name for the operator that undestands -// dos33 disks. -const operatorName = "dos33" +// dos3 disks. +const operatorName = "dos3" // Name returns the name of the operator. func (o operator) Name() string { @@ -504,7 +505,7 @@ func (o operator) GetFile(filename string) (disk.FileInfo, error) { return disk.FileInfo{}, fmt.Errorf("%s does not yet implement `GetFile`", operatorName) } -// operatorFactory is the factory that returns dos33 operators given +// operatorFactory is the factory that returns dos3 operators given // disk images. func operatorFactory(sd disk.SectorDisk) (disk.Operator, error) { lsd, err := disk.NewMappedDisk(sd, disk.Dos33LogicalToPhysicalSectorMap) diff --git a/lib/dos33/dos33_test.go b/lib/dos3/dos3_test.go similarity index 99% rename from lib/dos33/dos33_test.go rename to lib/dos3/dos3_test.go index 5bf6ff9..2ce1d04 100644 --- a/lib/dos33/dos33_test.go +++ b/lib/dos3/dos3_test.go @@ -1,4 +1,4 @@ -package dos33 +package dos3 import ( "crypto/rand" diff --git a/lib/dos33/testdata/dos33test.dsk b/lib/dos3/testdata/dos33test.dsk similarity index 100% rename from lib/dos33/testdata/dos33test.dsk rename to lib/dos3/testdata/dos33test.dsk diff --git a/lib/supermon/supermon.go b/lib/supermon/supermon.go index 102fce9..23c160a 100644 --- a/lib/supermon/supermon.go +++ b/lib/supermon/supermon.go @@ -325,8 +325,8 @@ func (o operator) GetFile(filename string) (disk.FileInfo, error) { }, nil } -// operatorFactory is the factory that returns dos33 operators given -// disk images. +// operatorFactory is the factory that returns supermon operators +// given disk images. func operatorFactory(sd disk.SectorDisk) (disk.Operator, error) { sm, err := LoadSectorMap(sd) if err != nil {