Switch from os.* to fs.* types

reader.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"hash/crc32"
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -148,7 +149,7 @@ func OpenReaderWithPassword(name, password string) (*ReadCloser, error) {
 		for i := 2; true; i++ {
 			f, err := os.Open(fmt.Sprintf("%s.%03d", strings.TrimSuffix(name, ext), i))
 			if err != nil {
-				if os.IsNotExist(err) {
+				if errors.Is(err, fs.ErrNotExist) {
 					break
 				}
 

struct.go

@@ -6,7 +6,7 @@ import (
 	"hash"
 	"hash/crc32"
 	"io"
-	"os"
+	"io/fs"
 	"path"
 	"time"
 
@@ -329,8 +329,8 @@ type FileHeader struct {
 	isEmptyFile      bool
 }
 
-// FileInfo returns an os.FileInfo for the FileHeader.
-func (h *FileHeader) FileInfo() os.FileInfo {
+// FileInfo returns an fs.FileInfo for the FileHeader.
+func (h *FileHeader) FileInfo() fs.FileInfo {
 	return headerFileInfo{h}
 }
 
@@ -354,7 +354,7 @@ func (fi headerFileInfo) ModTime() time.Time {
 	return fi.fh.Modified.UTC()
 }
 
-func (fi headerFileInfo) Mode() os.FileMode {
+func (fi headerFileInfo) Mode() fs.FileMode {
 	return fi.fh.Mode()
 }
 
@@ -382,7 +382,7 @@ const (
 )
 
 // Mode returns the permission and mode bits for the FileHeader.
-func (h *FileHeader) Mode() (mode os.FileMode) {
+func (h *FileHeader) Mode() (mode fs.FileMode) {
 	// Prefer the POSIX attributes if they're present
 	if h.Attributes&0xf0000000 != 0 {
 		mode = unixModeToFileMode(h.Attributes >> 16)
@@ -393,9 +393,9 @@ func (h *FileHeader) Mode() (mode os.FileMode) {
 	return
 }
 
-func msdosModeToFileMode(m uint32) (mode os.FileMode) {
+func msdosModeToFileMode(m uint32) (mode fs.FileMode) {
 	if m&msdosDir != 0 {
-		mode = os.ModeDir | 0o777
+		mode = fs.ModeDir | 0o777
 	} else {
 		mode = 0o666
 	}
@@ -408,36 +408,36 @@ func msdosModeToFileMode(m uint32) (mode os.FileMode) {
 }
 
 //nolint:cyclop
-func unixModeToFileMode(m uint32) os.FileMode {
-	mode := os.FileMode(m & 0o777)
+func unixModeToFileMode(m uint32) fs.FileMode {
+	mode := fs.FileMode(m & 0o777)
 
 	switch m & sIFMT {
 	case sIFBLK:
-		mode |= os.ModeDevice
+		mode |= fs.ModeDevice
 	case sIFCHR:
-		mode |= os.ModeDevice | os.ModeCharDevice
+		mode |= fs.ModeDevice | fs.ModeCharDevice
 	case sIFDIR:
-		mode |= os.ModeDir
+		mode |= fs.ModeDir
 	case sIFIFO:
-		mode |= os.ModeNamedPipe
+		mode |= fs.ModeNamedPipe
 	case sIFLNK:
-		mode |= os.ModeSymlink
+		mode |= fs.ModeSymlink
 	case sIFREG:
 		// nothing to do
 	case sIFSOCK:
-		mode |= os.ModeSocket
+		mode |= fs.ModeSocket
 	}
 
 	if m&sISGID != 0 {
-		mode |= os.ModeSetgid
+		mode |= fs.ModeSetgid
 	}
 
 	if m&sISUID != 0 {
-		mode |= os.ModeSetuid
+		mode |= fs.ModeSetuid
 	}
 
 	if m&sISVTX != 0 {
-		mode |= os.ModeSticky
+		mode |= fs.ModeSticky
 	}
 
 	return mode