Replace os.FileMode with fs.FileMode

pjbgf · pjbgf · commit 5a830a398543 · 2025-01-24T18:53:46.000Z
Upstream the former is already pointing to the latter, so this should
represent no actual change to downstream users.

Signed-off-by: Paulo Gomes &lt;pjbgf@linux.com&gt;
diff --git a/fs.go b/fs.go
@@ -4,7 +4,6 @@ import (
 	"errors"
 	"io"
 	"io/fs"
-	"os"
 	"time"
 )
 
@@ -73,9 +72,9 @@ type Basic interface {
 	// instead. It opens the named file with specified flag (O_RDONLY etc.) and
 	// perm, (0666 etc.) if applicable. If successful, methods on the returned
 	// File can be used for I/O.
-	OpenFile(filename string, flag int, perm os.FileMode) (File, error)
+	OpenFile(filename string, flag int, perm fs.FileMode) (File, error)
 	// Stat returns a FileInfo describing the named file.
-	Stat(filename string) (os.FileInfo, error)
+	Stat(filename string) (fs.FileInfo, error)
 	// Rename renames (moves) oldpath to newpath. If newpath already exists and
 	// is not a directory, Rename replaces it. OS-specific restrictions may
 	// apply when oldpath and newpath are in different directories.
@@ -106,12 +105,12 @@ type TempFile interface {
 type Dir interface {
 	// ReadDir reads the directory named by dirname and returns a list of
 	// directory entries sorted by filename.
-	ReadDir(path string) ([]os.FileInfo, error)
+	ReadDir(path string) ([]fs.FileInfo, error)
 	// MkdirAll creates a directory named path, along with any necessary
 	// parents, and returns nil, or else returns an error. The permission bits
 	// perm are used for all directories that MkdirAll creates. If path is/
 	// already a directory, MkdirAll does nothing and returns nil.
-	MkdirAll(filename string, perm os.FileMode) error
+	MkdirAll(filename string, perm fs.FileMode) error
 }
 
 // Symlink abstract the symlink related operations in a storage-agnostic
@@ -120,7 +119,7 @@ type Symlink interface {
 	// Lstat returns a FileInfo describing the named file. If the file is a
 	// symbolic link, the returned FileInfo describes the symbolic link. Lstat
 	// makes no attempt to follow the link.
-	Lstat(filename string) (os.FileInfo, error)
+	Lstat(filename string) (fs.FileInfo, error)
 	// Symlink creates a symbolic-link from link to target. target may be an
 	// absolute or relative path, and need not refer to an existing node.
 	// Parent directories of link are created as necessary.
@@ -134,7 +133,7 @@ type Symlink interface {
 type Change interface {
 	// Chmod changes the mode of the named file to mode. If the file is a
 	// symbolic link, it changes the mode of the link's target.
-	Chmod(name string, mode os.FileMode) error
+	Chmod(name string, mode fs.FileMode) error
 	// Lchown changes the numeric uid and gid of the named file. If the file is
 	// a symbolic link, it changes the uid and gid of the link itself.
 	Lchown(name string, uid, gid int) error
diff --git a/helper/chroot/chroot.go b/helper/chroot/chroot.go
@@ -1,6 +1,7 @@
 package chroot
 
 import (
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -68,7 +69,7 @@ func (fs *ChrootHelper) Open(filename string) (billy.File, error) {
 	return newFile(fs, f, filename), nil
 }
 
-func (fs *ChrootHelper) OpenFile(filename string, flag int, mode os.FileMode) (billy.File, error) {
+func (fs *ChrootHelper) OpenFile(filename string, flag int, mode fs.FileMode) (billy.File, error) {
 	fullpath, err := fs.underlyingPath(filename)
 	if err != nil {
 		return nil, err
@@ -142,7 +143,7 @@ func (fs *ChrootHelper) ReadDir(path string) ([]os.FileInfo, error) {
 	return fs.underlying.(billy.Dir).ReadDir(fullpath)
 }
 
-func (fs *ChrootHelper) MkdirAll(filename string, perm os.FileMode) error {
+func (fs *ChrootHelper) MkdirAll(filename string, perm fs.FileMode) error {
 	fullpath, err := fs.underlyingPath(filename)
 	if err != nil {
 		return err
diff --git a/helper/mount/mount.go b/helper/mount/mount.go
@@ -2,6 +2,7 @@ package mount
 
 import (
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -53,7 +54,7 @@ func (h *Mount) Open(path string) (billy.File, error) {
 	return wrapFile(f, path), err
 }
 
-func (h *Mount) OpenFile(path string, flag int, mode os.FileMode) (billy.File, error) {
+func (h *Mount) OpenFile(path string, flag int, mode fs.FileMode) (billy.File, error) {
 	fs, fullpath := h.getBasicAndPath(path)
 	if fullpath == "." {
 		return nil, os.ErrInvalid
@@ -118,7 +119,7 @@ func (h *Mount) ReadDir(path string) ([]os.FileInfo, error) {
 	return fs.ReadDir(fullpath)
 }
 
-func (h *Mount) MkdirAll(filename string, perm os.FileMode) error {
+func (h *Mount) MkdirAll(filename string, perm fs.FileMode) error {
 	fs, fullpath, err := h.getDirAndPath(filename)
 	if err != nil {
 		return err
diff --git a/helper/polyfill/polyfill.go b/helper/polyfill/polyfill.go
@@ -1,6 +1,7 @@
 package polyfill
 
 import (
+	"io/fs"
 	"os"
 	"path/filepath"
 
@@ -47,7 +48,7 @@ func (h *Polyfill) ReadDir(path string) ([]os.FileInfo, error) {
 	return h.Basic.(billy.Dir).ReadDir(path)
 }
 
-func (h *Polyfill) MkdirAll(filename string, perm os.FileMode) error {
+func (h *Polyfill) MkdirAll(filename string, perm fs.FileMode) error {
 	if !h.c.dir {
 		return billy.ErrNotSupported
 	}
diff --git a/internal/test/mock.go b/internal/test/mock.go
@@ -30,7 +30,7 @@ func (fs *BasicMock) Open(filename string) (billy.File, error) {
 	return &FileMock{name: filename}, nil
 }
 
-func (fs *BasicMock) OpenFile(filename string, flag int, mode os.FileMode) (billy.File, error) {
+func (fs *BasicMock) OpenFile(filename string, flag int, mode fs.FileMode) (billy.File, error) {
 	fs.OpenFileArgs = append(fs.OpenFileArgs, [3]interface{}{filename, flag, mode})
 	return &FileMock{name: filename}, nil
 }
@@ -76,7 +76,7 @@ func (fs *DirMock) ReadDir(path string) ([]os.FileInfo, error) {
 	return nil, nil
 }
 
-func (fs *DirMock) MkdirAll(filename string, perm os.FileMode) error {
+func (fs *DirMock) MkdirAll(filename string, perm fs.FileMode) error {
 	fs.MkdirAllArgs = append(fs.MkdirAllArgs, [2]interface{}{filename, perm})
 	return nil
 }
diff --git a/memfs/memory.go b/memfs/memory.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"sort"
@@ -43,7 +44,7 @@ func (fs *Memory) Open(filename string) (billy.File, error) {
 	return fs.OpenFile(filename, os.O_RDONLY, 0)
 }
 
-func (fs *Memory) OpenFile(filename string, flag int, perm os.FileMode) (billy.File, error) {
+func (fs *Memory) OpenFile(filename string, flag int, perm fs.FileMode) (billy.File, error) {
 	f, has := fs.s.Get(filename)
 	if !has {
 		if !isCreate(flag) {
@@ -154,7 +155,7 @@ func (fs *Memory) ReadDir(path string) ([]os.FileInfo, error) {
 	return entries, nil
 }
 
-func (fs *Memory) MkdirAll(path string, perm os.FileMode) error {
+func (fs *Memory) MkdirAll(path string, perm fs.FileMode) error {
 	_, err := fs.s.New(path, perm|os.ModeDir, 0)
 	return err
 }
@@ -318,7 +319,7 @@ func (f *file) Truncate(size int64) error {
 	return nil
 }
 
-func (f *file) Duplicate(filename string, mode os.FileMode, flag int) billy.File {
+func (f *file) Duplicate(filename string, mode fs.FileMode, flag int) billy.File {
 	new := &file{
 		name:    filename,
 		content: f.content,
@@ -372,7 +373,7 @@ func (fi *fileInfo) Size() int64 {
 	return int64(fi.size)
 }
 
-func (fi *fileInfo) Mode() os.FileMode {
+func (fi *fileInfo) Mode() fs.FileMode {
 	return fi.mode
 }
 
@@ -424,6 +425,6 @@ func isWriteOnly(flag int) bool {
 	return flag&os.O_WRONLY != 0
 }
 
-func isSymlink(m os.FileMode) bool {
+func isSymlink(m fs.FileMode) bool {
 	return m&os.ModeSymlink != 0
 }
diff --git a/memfs/storage.go b/memfs/storage.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -30,7 +31,7 @@ func (s *storage) Has(path string) bool {
 	return ok
 }
 
-func (s *storage) New(path string, mode os.FileMode, flag int) (*file, error) {
+func (s *storage) New(path string, mode fs.FileMode, flag int) (*file, error) {
 	path = clean(path)
 	if s.Has(path) {
 		if !s.MustGet(path).mode.IsDir() {
@@ -55,7 +56,7 @@ func (s *storage) New(path string, mode os.FileMode, flag int) (*file, error) {
 	return f, nil
 }
 
-func (s *storage) createParent(path string, mode os.FileMode, f *file) error {
+func (s *storage) createParent(path string, mode fs.FileMode, f *file) error {
 	base := filepath.Dir(path)
 	base = clean(base)
 	if f.Name() == string(separator) {
diff --git a/osfs/os.go b/osfs/os.go
@@ -103,7 +103,7 @@ func tempFile(dir, prefix string) (billy.File, error) {
 	return &file{File: f}, nil
 }
 
-func openFile(fn string, flag int, perm os.FileMode, createDir func(string) error) (billy.File, error) {
+func openFile(fn string, flag int, perm fs.FileMode, createDir func(string) error) (billy.File, error) {
 	if flag&os.O_CREATE != 0 {
 		if createDir == nil {
 			return nil, fmt.Errorf("createDir func cannot be nil if file needs to be opened in create mode")
diff --git a/osfs/os_bound.go b/osfs/os_bound.go
@@ -22,6 +22,7 @@ package osfs
 import (
 	"errors"
 	"fmt"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -59,7 +60,7 @@ func (fs *BoundOS) Create(filename string) (billy.File, error) {
 	return fs.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, defaultCreateMode)
 }
 
-func (fs *BoundOS) OpenFile(filename string, flag int, perm os.FileMode) (billy.File, error) {
+func (fs *BoundOS) OpenFile(filename string, flag int, perm fs.FileMode) (billy.File, error) {
 	filename = fs.expandDot(filename)
 	fn, err := fs.abs(filename)
 	if err != nil {
@@ -102,7 +103,7 @@ func (fs *BoundOS) Rename(from, to string) error {
 	return os.Rename(f, t)
 }
 
-func (fs *BoundOS) MkdirAll(path string, perm os.FileMode) error {
+func (fs *BoundOS) MkdirAll(path string, perm fs.FileMode) error {
 	path = fs.expandDot(path)
 	dir, err := fs.abs(path)
 	if err != nil {
diff --git a/osfs/os_chroot.go b/osfs/os_chroot.go
@@ -4,6 +4,7 @@
 package osfs
 
 import (
+	"io/fs"
 	"os"
 	"path/filepath"
 
@@ -31,7 +32,7 @@ func (fs *ChrootOS) Create(filename string) (billy.File, error) {
 	return fs.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, defaultCreateMode)
 }
 
-func (fs *ChrootOS) OpenFile(filename string, flag int, perm os.FileMode) (billy.File, error) {
+func (fs *ChrootOS) OpenFile(filename string, flag int, perm fs.FileMode) (billy.File, error) {
 	return openFile(filename, flag, perm, fs.createDir)
 }
 
@@ -58,7 +59,7 @@ func (fs *ChrootOS) Rename(from, to string) error {
 	return rename(from, to)
 }
 
-func (fs *ChrootOS) MkdirAll(path string, perm os.FileMode) error {
+func (fs *ChrootOS) MkdirAll(path string, perm fs.FileMode) error {
 	return os.MkdirAll(path, defaultDirectoryMode)
 }
 
diff --git a/test/common_mem.go b/test/common_mem.go
@@ -3,14 +3,14 @@
 package test
 
 import (
-	"os"
+	"io/fs"
 
 	"github.com/go-git/go-billy/v6"
 	"github.com/go-git/go-billy/v6/memfs"
 )
 
 var (
-	customMode            os.FileMode = 0o600
+	customMode            fs.FileMode = 0o600
 	expectedSymlinkTarget             = "/dir/file"
 )
 
diff --git a/test/common_posix.go b/test/common_posix.go
@@ -4,15 +4,15 @@
 package test
 
 import (
-	"os"
+	"io/fs"
 
 	"github.com/go-git/go-billy/v6"
 	"github.com/go-git/go-billy/v6/memfs"
 	"github.com/go-git/go-billy/v6/osfs"
 )
 
 var (
-	customMode            os.FileMode = 0o755
+	customMode            fs.FileMode = 0o755
 	expectedSymlinkTarget             = "/dir/file"
 )
 
diff --git a/test/common_windows.go b/test/common_windows.go
@@ -4,15 +4,15 @@
 package test
 
 import (
-	"os"
+	"io/fs"
 
 	"github.com/go-git/go-billy/v6"
 	"github.com/go-git/go-billy/v6/memfs"
 	"github.com/go-git/go-billy/v6/osfs"
 )
 
 var (
-	customMode            os.FileMode = 0o666
+	customMode            fs.FileMode = 0o666
 	expectedSymlinkTarget             = "\\dir\\file"
 )
 
diff --git a/util/util.go b/util/util.go
@@ -3,6 +3,7 @@ package util
 import (
 	"errors"
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -97,7 +98,7 @@ func removeAll(fs billy.Basic, path string) error {
 // WriteFile writes data to a file named by filename in the given filesystem.
 // If the file does not exist, WriteFile creates it with permissions perm;
 // otherwise WriteFile truncates it before writing.
-func WriteFile(fs billy.Basic, filename string, data []byte, perm os.FileMode) (err error) {
+func WriteFile(fs billy.Basic, filename string, data []byte, perm fs.FileMode) (err error) {
 	f, err := fs.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, perm)
 	if err != nil {
 		return err

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package polyfill`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "io/fs"`
`4`	`5`	`"os"`
`5`	`6`	`"path/filepath"`
`6`	`7`
`@@ -47,7 +48,7 @@ func (h *Polyfill) ReadDir(path string) ([]os.FileInfo, error) {`
`47`	`48`	`return h.Basic.(billy.Dir).ReadDir(path)`
`48`	`49`	`}`
`49`	`50`
`50`		`-func (h *Polyfill) MkdirAll(filename string, perm os.FileMode) error {`
	`51`	`+func (h *Polyfill) MkdirAll(filename string, perm fs.FileMode) error {`
`51`	`52`	`if !h.c.dir {`
`52`	`53`	`return billy.ErrNotSupported`
`53`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func (fs *BasicMock) Open(filename string) (billy.File, error) {`
`30`	`30`	`return &FileMock{name: filename}, nil`
`31`	`31`	`}`
`32`	`32`
`33`		`-func (fs *BasicMock) OpenFile(filename string, flag int, mode os.FileMode) (billy.File, error) {`
	`33`	`+func (fs *BasicMock) OpenFile(filename string, flag int, mode fs.FileMode) (billy.File, error) {`
`34`	`34`	`fs.OpenFileArgs = append(fs.OpenFileArgs, [3]interface{}{filename, flag, mode})`
`35`	`35`	`return &FileMock{name: filename}, nil`
`36`	`36`	`}`
`@@ -76,7 +76,7 @@ func (fs *DirMock) ReadDir(path string) ([]os.FileInfo, error) {`
`76`	`76`	`return nil, nil`
`77`	`77`	`}`
`78`	`78`
`79`		`-func (fs *DirMock) MkdirAll(filename string, perm os.FileMode) error {`
	`79`	`+func (fs *DirMock) MkdirAll(filename string, perm fs.FileMode) error {`
`80`	`80`	`fs.MkdirAllArgs = append(fs.MkdirAllArgs, [2]interface{}{filename, perm})`
`81`	`81`	`return nil`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"errors"`
`6`	`6`	`"fmt"`
`7`	`7`	`"io"`
	`8`	`+ "io/fs"`
`8`	`9`	`"os"`
`9`	`10`	`"path/filepath"`
`10`	`11`	`"sort"`
`@@ -43,7 +44,7 @@ func (fs *Memory) Open(filename string) (billy.File, error) {`
`43`	`44`	`return fs.OpenFile(filename, os.O_RDONLY, 0)`
`44`	`45`	`}`
`45`	`46`
`46`		`-func (fs *Memory) OpenFile(filename string, flag int, perm os.FileMode) (billy.File, error) {`
	`47`	`+func (fs *Memory) OpenFile(filename string, flag int, perm fs.FileMode) (billy.File, error) {`
`47`	`48`	`f, has := fs.s.Get(filename)`
`48`	`49`	`if !has {`
`49`	`50`	`if !isCreate(flag) {`
`@@ -154,7 +155,7 @@ func (fs *Memory) ReadDir(path string) ([]os.FileInfo, error) {`
`154`	`155`	`return entries, nil`
`155`	`156`	`}`
`156`	`157`
`157`		`-func (fs *Memory) MkdirAll(path string, perm os.FileMode) error {`
	`158`	`+func (fs *Memory) MkdirAll(path string, perm fs.FileMode) error {`
`158`	`159`	`_, err := fs.s.New(path, perm\|os.ModeDir, 0)`
`159`	`160`	`return err`
`160`	`161`	`}`
`@@ -318,7 +319,7 @@ func (f *file) Truncate(size int64) error {`
`318`	`319`	`return nil`
`319`	`320`	`}`
`320`	`321`
`321`		`-func (f *file) Duplicate(filename string, mode os.FileMode, flag int) billy.File {`
	`322`	`+func (f *file) Duplicate(filename string, mode fs.FileMode, flag int) billy.File {`
`322`	`323`	`new := &file{`
`323`	`324`	`name: filename,`
`324`	`325`	`content: f.content,`
`@@ -372,7 +373,7 @@ func (fi *fileInfo) Size() int64 {`
`372`	`373`	`return int64(fi.size)`
`373`	`374`	`}`
`374`	`375`
`375`		`-func (fi *fileInfo) Mode() os.FileMode {`
	`376`	`+func (fi *fileInfo) Mode() fs.FileMode {`
`376`	`377`	`return fi.mode`
`377`	`378`	`}`
`378`	`379`
`@@ -424,6 +425,6 @@ func isWriteOnly(flag int) bool {`
`424`	`425`	`return flag&os.O_WRONLY != 0`
`425`	`426`	`}`
`426`	`427`
`427`		`-func isSymlink(m os.FileMode) bool {`
	`428`	`+func isSymlink(m fs.FileMode) bool {`
`428`	`429`	`return m&os.ModeSymlink != 0`
`429`	`430`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func tempFile(dir, prefix string) (billy.File, error) {`
`103`	`103`	`return &file{File: f}, nil`
`104`	`104`	`}`
`105`	`105`
`106`		`-func openFile(fn string, flag int, perm os.FileMode, createDir func(string) error) (billy.File, error) {`
	`106`	`+func openFile(fn string, flag int, perm fs.FileMode, createDir func(string) error) (billy.File, error) {`
`107`	`107`	`if flag&os.O_CREATE != 0 {`
`108`	`108`	`if createDir == nil {`
`109`	`109`	`return nil, fmt.Errorf("createDir func cannot be nil if file needs to be opened in create mode")`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`package osfs`
`5`	`5`
`6`	`6`	`import (`
	`7`	`+ "io/fs"`
`7`	`8`	`"os"`
`8`	`9`	`"path/filepath"`
`9`	`10`
`@@ -31,7 +32,7 @@ func (fs *ChrootOS) Create(filename string) (billy.File, error) {`
`31`	`32`	`return fs.OpenFile(filename, os.O_RDWR\|os.O_CREATE\|os.O_TRUNC, defaultCreateMode)`
`32`	`33`	`}`
`33`	`34`
`34`		`-func (fs *ChrootOS) OpenFile(filename string, flag int, perm os.FileMode) (billy.File, error) {`
	`35`	`+func (fs *ChrootOS) OpenFile(filename string, flag int, perm fs.FileMode) (billy.File, error) {`
`35`	`36`	`return openFile(filename, flag, perm, fs.createDir)`
`36`	`37`	`}`
`37`	`38`
`@@ -58,7 +59,7 @@ func (fs *ChrootOS) Rename(from, to string) error {`
`58`	`59`	`return rename(from, to)`
`59`	`60`	`}`
`60`	`61`
`61`		`-func (fs *ChrootOS) MkdirAll(path string, perm os.FileMode) error {`
	`62`	`+func (fs *ChrootOS) MkdirAll(path string, perm fs.FileMode) error {`
`62`	`63`	`return os.MkdirAll(path, defaultDirectoryMode)`
`63`	`64`	`}`
`64`	`65`