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

Work around broken Lstat on Android

Browse Source
This commit is contained in:
Jakob Borg
2015-04-14 19:31:25 +09:00
parent ba4a6fc0c5
commit 102a2db1f3
10 changed files with 59 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/versioner/external.go
View File

@@ -12,6 +12,8 @@ import (
"os/exec"
"path/filepath"
"strings"
"github.com/syncthing/syncthing/internal/osutil"
)
func init() {
@@ -43,7 +45,7 @@ func NewExternal(folderID, folderPath string, params map[string]string) Versione
// Move away the named file to a version archive. If this function returns
// nil, the named file does not exist any more (has been archived).
func (v External) Archive(filePath string) error {
_, err := os.Lstat(filePath)
_, err := osutil.Lstat(filePath)
if os.IsNotExist(err) {
if debug {
l.Debugln("not archiving nonexistent file", filePath)
@@ -82,7 +84,7 @@ func (v External) Archive(filePath string) error {
}
// return error if the file was not removed
if _, err = os.Lstat(filePath); os.IsNotExist(err) {
if _, err = osutil.Lstat(filePath); os.IsNotExist(err) {
return nil
}
return errors.New("Versioner: file was not removed by external script")

2
internal/versioner/simple.go
View File

@@ -46,7 +46,7 @@ func NewSimple(folderID, folderPath string, params map[string]string) Versioner
// Move away the named file to a version archive. If this function returns
// nil, the named file does not exist any more (has been archived).
func (v Simple) Archive(filePath string) error {
fileInfo, err := os.Lstat(filePath)
fileInfo, err := osutil.Lstat(filePath)
if os.IsNotExist(err) {
if debug {
l.Debugln("not archiving nonexistent file", filePath)

4
internal/versioner/staggered.go
View File

@@ -210,7 +210,7 @@ func (v Staggered) expire(versions []string) {
var prevAge int64
firstFile := true
for _, file := range versions {
fi, err := os.Lstat(file)
fi, err := osutil.Lstat(file)
if err != nil {
l.Warnln("versioner:", err)
continue
@@ -281,7 +281,7 @@ func (v Staggered) Archive(filePath string) error {
v.mutex.Lock()
defer v.mutex.Unlock()
_, err := os.Lstat(filePath)
_, err := osutil.Lstat(filePath)
if os.IsNotExist(err) {
if debug {
l.Debugln("not archiving nonexistent file", filePath)