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

lib/fs: A nil MtimeFS is valid (fixes #3958)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3961
This commit is contained in:
Jakob Borg 2017-02-05 12:54:08 +00:00
parent a72f5379fb
commit f1a073501f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/fs/mtimefs.go
View File

@ -24,7 +24,8 @@ type database interface {
var osChtimes = os.Chtimes var osChtimes = os.Chtimes
// The MtimeFS is a filesystem with nanosecond mtime precision, regardless // The MtimeFS is a filesystem with nanosecond mtime precision, regardless
// of what shenanigans the underlying filesystem gets up to. // of what shenanigans the underlying filesystem gets up to. A nil MtimeFS
// just does the underlying operations with no additions.
type MtimeFS struct { type MtimeFS struct {
db database db database
} }
@ -36,6 +37,10 @@ func NewMtimeFS(db database) *MtimeFS {
} }
func (f *MtimeFS) Chtimes(name string, atime, mtime time.Time) error { func (f *MtimeFS) Chtimes(name string, atime, mtime time.Time) error {
if f == nil {
return osChtimes(name, atime, mtime)
}
// Do a normal Chtimes call, don't care if it succeeds or not. // Do a normal Chtimes call, don't care if it succeeds or not.
osChtimes(name, atime, mtime) osChtimes(name, atime, mtime)
@ -52,6 +57,10 @@ func (f *MtimeFS) Chtimes(name string, atime, mtime time.Time) error {
} }
func (f *MtimeFS) Lstat(name string) (os.FileInfo, error) { func (f *MtimeFS) Lstat(name string) (os.FileInfo, error) {
if f == nil {
return osutil.Lstat(name)
}
info, err := osutil.Lstat(name) info, err := osutil.Lstat(name)
if err != nil { if err != nil {
return nil, err return nil, err