TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-08-25 23:47:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fs: drop unused permission parameter from OpenFile

Browse Source
This commit is contained in:
Michael Eischer
2024-11-02 17:47:54 +01:00
parent b402e8a6fc
commit 623ba92b98
12 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/fs/file.go
View File

@@ -67,7 +67,7 @@ func ResetPermissions(path string) error {
// Readdirnames returns a list of file in a directory. Flags are passed to fs.OpenFile.
// O_RDONLY and O_DIRECTORY are implied.
func Readdirnames(filesystem FS, dir string, flags int) ([]string, error) {
f, err := filesystem.OpenFile(dir, O_RDONLY|O_DIRECTORY|flags, 0)
f, err := filesystem.OpenFile(dir, O_RDONLY|O_DIRECTORY|flags)
if err != nil {
return nil, fmt.Errorf("openfile for readdirnames failed: %w", err)
}

4
internal/fs/fs_local.go
View File

@@ -25,8 +25,8 @@ func (fs Local) VolumeName(path string) string {
// (O_RDONLY etc.) and perm, (0666 etc.) if applicable. If successful,
// methods on the returned File can be used for I/O.
// If there is an error, it will be of type *PathError.
func (fs Local) OpenFile(name string, flag int, perm os.FileMode) (File, error) {
f, err := os.OpenFile(fixpath(name), flag, perm)
func (fs Local) OpenFile(name string, flag int) (File, error) {
f, err := os.OpenFile(fixpath(name), flag, 0)
if err != nil {
return nil, err
}

4
internal/fs/fs_local_vss.go
View File

@@ -127,8 +127,8 @@ func (fs *LocalVss) DeleteSnapshots() {
}
// OpenFile wraps the Open method of the underlying file system.
func (fs *LocalVss) OpenFile(name string, flag int, perm os.FileMode) (File, error) {
return fs.FS.OpenFile(fs.snapshotPath(name), flag, perm)
func (fs *LocalVss) OpenFile(name string, flag int) (File, error) {
return fs.FS.OpenFile(fs.snapshotPath(name), flag)
}
// Stat wraps the Stat method of the underlying file system.

2
internal/fs/fs_local_vss_test.go
View File

@@ -331,7 +331,7 @@ func TestVSSFS(t *testing.T) {
rtest.OK(t, err)
rtest.Equals(t, origFi.Mode(), lstatFi.Mode())
f, err := localVss.OpenFile(tempfile, os.O_RDONLY, 0)
f, err := localVss.OpenFile(tempfile, os.O_RDONLY)
rtest.OK(t, err)
data, err := io.ReadAll(f)
rtest.OK(t, err)

2
internal/fs/fs_reader.go
View File

@@ -54,7 +54,7 @@ func (fs *Reader) fi() os.FileInfo {
// (O_RDONLY etc.) and perm, (0666 etc.) if applicable. If successful,
// methods on the returned File can be used for I/O.
// If there is an error, it will be of type *os.PathError.
func (fs *Reader) OpenFile(name string, flag int, _ os.FileMode) (f File, err error) {
func (fs *Reader) OpenFile(name string, flag int) (f File, err error) {
if flag & ^(O_RDONLY|O_NOFOLLOW) != 0 {
return nil, pathError("open", name,
fmt.Errorf("invalid combination of flags 0x%x", flag))

8
internal/fs/fs_reader_test.go
View File

@@ -16,7 +16,7 @@ import (
)
func verifyFileContentOpenFile(t testing.TB, fs FS, filename string, want []byte) {
f, err := fs.OpenFile(filename, O_RDONLY, 0)
f, err := fs.OpenFile(filename, O_RDONLY)
if err != nil {
t.Fatal(err)
}
@@ -37,7 +37,7 @@ func verifyFileContentOpenFile(t testing.TB, fs FS, filename string, want []byte
}
func verifyDirectoryContents(t testing.TB, fs FS, dir string, want []string) {
f, err := fs.OpenFile(dir, os.O_RDONLY, 0)
f, err := fs.OpenFile(dir, os.O_RDONLY)
if err != nil {
t.Fatal(err)
}
@@ -123,7 +123,7 @@ func TestFSReader(t *testing.T) {
{
name: "file/Stat",
f: func(t *testing.T, fs FS) {
f, err := fs.OpenFile(filename, os.O_RDONLY, 0)
f, err := fs.OpenFile(filename, os.O_RDONLY)
if err != nil {
t.Fatal(err)
}
@@ -295,7 +295,7 @@ func TestFSReaderMinFileSize(t *testing.T) {
AllowEmptyFile: test.allowEmpty,
}
f, err := fs.OpenFile("testfile", os.O_RDONLY, 0)
f, err := fs.OpenFile("testfile", os.O_RDONLY)
if err != nil {
t.Fatal(err)
}

4
internal/fs/fs_track.go
View File

@@ -16,8 +16,8 @@ type Track struct {
}
// OpenFile wraps the OpenFile method of the underlying file system.
func (fs Track) OpenFile(name string, flag int, perm os.FileMode) (File, error) {
f, err := fs.FS.OpenFile(fixpath(name), flag, perm)
func (fs Track) OpenFile(name string, flag int) (File, error) {
f, err := fs.FS.OpenFile(fixpath(name), flag)
if err != nil {
return nil, err
}

2
internal/fs/interface.go
View File

@@ -9,7 +9,7 @@ import (
// FS bundles all methods needed for a file system.
type FS interface {
OpenFile(name string, flag int, perm os.FileMode) (File, error)
OpenFile(name string, flag int) (File, error)
Stat(name string) (os.FileInfo, error)
Lstat(name string) (os.FileInfo, error)
DeviceID(fi os.FileInfo) (deviceID uint64, err error)