perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/fs: Rename fsFile* to basicFile* (#5546)

Browse Source
This commit is contained in:
Simon Frei
2019-02-24 18:02:02 +01:00
committed by GitHub
parent 4b8853bfde
commit ad5a046843
5 changed files with 34 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/fs/basicfs.go
View File

@@ -144,7 +144,7 @@ func (f *BasicFilesystem) Lstat(name string) (FileInfo, error) {
if err != nil {
return nil, err
}
return fsFileInfo{fi}, err
return basicFileInfo{fi}, err
}
func (f *BasicFilesystem) Remove(name string) error {
@@ -184,7 +184,7 @@ func (f *BasicFilesystem) Stat(name string) (FileInfo, error) {
if err != nil {
return nil, err
}
return fsFileInfo{fi}, err
return basicFileInfo{fi}, err
}
func (f *BasicFilesystem) DirNames(name string) ([]string, error) {
@@ -215,7 +215,7 @@ func (f *BasicFilesystem) Open(name string) (File, error) {
if err != nil {
return nil, err
}
return fsFile{fd, name}, err
return basicFile{fd, name}, err
}
func (f *BasicFilesystem) OpenFile(name string, flags int, mode FileMode) (File, error) {
@@ -227,7 +227,7 @@ func (f *BasicFilesystem) OpenFile(name string, flags int, mode FileMode) (File,
if err != nil {
return nil, err
}
return fsFile{fd, name}, err
return basicFile{fd, name}, err
}
func (f *BasicFilesystem) Create(name string) (File, error) {
@@ -239,7 +239,7 @@ func (f *BasicFilesystem) Create(name string) (File, error) {
if err != nil {
return nil, err
}
return fsFile{fd, name}, err
return basicFile{fd, name}, err
}
func (f *BasicFilesystem) Walk(root string, walkFn WalkFunc) error {
@@ -283,8 +283,8 @@ func (f *BasicFilesystem) URI() string {
func (f *BasicFilesystem) SameFile(fi1, fi2 FileInfo) bool {
// Like os.SameFile, we always return false unless fi1 and fi2 were created
// by this package's Stat/Lstat method.
f1, ok1 := fi1.(fsFileInfo)
f2, ok2 := fi2.(fsFileInfo)
f1, ok1 := fi1.(basicFileInfo)
f2, ok2 := fi2.(basicFileInfo)
if !ok1 || !ok2 {
return false
}
@@ -292,36 +292,36 @@ func (f *BasicFilesystem) SameFile(fi1, fi2 FileInfo) bool {
return os.SameFile(f1.FileInfo, f2.FileInfo)
}
// fsFile implements the fs.File interface on top of an os.File
type fsFile struct {
// basicFile implements the fs.File interface on top of an os.File
type basicFile struct {
*os.File
name string
}
func (f fsFile) Name() string {
func (f basicFile) Name() string {
return f.name
}
func (f fsFile) Stat() (FileInfo, error) {
func (f basicFile) Stat() (FileInfo, error) {
info, err := f.File.Stat()
if err != nil {
return nil, err
}
return fsFileInfo{info}, nil
return basicFileInfo{info}, nil
}
// fsFileInfo implements the fs.FileInfo interface on top of an os.FileInfo.
type fsFileInfo struct {
// basicFileInfo implements the fs.FileInfo interface on top of an os.FileInfo.
type basicFileInfo struct {
os.FileInfo
}
func (e fsFileInfo) IsSymlink() bool {
// Must use fsFileInfo.Mode() because it may apply magic.
func (e basicFileInfo) IsSymlink() bool {
// Must use basicFileInfo.Mode() because it may apply magic.
return e.Mode()&ModeSymlink != 0
}
func (e fsFileInfo) IsRegular() bool {
// Must use fsFileInfo.Mode() because it may apply magic.
func (e basicFileInfo) IsRegular() bool {
// Must use basicFileInfo.Mode() because it may apply magic.
return e.Mode()&ModeType == 0
}