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

Update protocol package (fixes #2040)

Browse Source
This commit is contained in:
Audrius Butkevicius
2015-07-09 22:39:22 +01:00
parent 1ded554a15
commit b8dcb7c884
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@@ -35,7 +35,7 @@
}, },
{ {
"ImportPath": "github.com/syncthing/protocol", "ImportPath": "github.com/syncthing/protocol",
"Rev": "95e15c95f21b81b09772f07de5c142a3e68f78db" "Rev": "9dd6f848bdcd3550606158a33d6aa98de6ea0cdc"
}, },
{ {
"ImportPath": "github.com/syndtr/goleveldb/leveldb", "ImportPath": "github.com/syndtr/goleveldb/leveldb",

8
Godeps/_workspace/src/github.com/syncthing/protocol/nativemodel_windows.go generated vendored
View File

@@ -25,12 +25,12 @@ type nativeModel struct {
} }
func (m nativeModel) Index(deviceID DeviceID, folder string, files []FileInfo, flags uint32, options []Option) { func (m nativeModel) Index(deviceID DeviceID, folder string, files []FileInfo, flags uint32, options []Option) {
fixupFiles(files) fixupFiles(folder, files)
m.next.Index(deviceID, folder, files, flags, options) m.next.Index(deviceID, folder, files, flags, options)
} }
func (m nativeModel) IndexUpdate(deviceID DeviceID, folder string, files []FileInfo, flags uint32, options []Option) { func (m nativeModel) IndexUpdate(deviceID DeviceID, folder string, files []FileInfo, flags uint32, options []Option) {
fixupFiles(files) fixupFiles(folder, files)
m.next.IndexUpdate(deviceID, folder, files, flags, options) m.next.IndexUpdate(deviceID, folder, files, flags, options)
} }
@@ -47,7 +47,7 @@ func (m nativeModel) Close(deviceID DeviceID, err error) {
m.next.Close(deviceID, err) m.next.Close(deviceID, err)
} }
func fixupFiles(files []FileInfo) { func fixupFiles(folder string, files []FileInfo) {
for i, f := range files { for i, f := range files {
if strings.ContainsAny(f.Name, disallowedCharacters) { if strings.ContainsAny(f.Name, disallowedCharacters) {
if f.IsDeleted() { if f.IsDeleted() {
@@ -56,7 +56,7 @@ func fixupFiles(files []FileInfo) {
continue continue
} }
files[i].Flags |= FlagInvalid files[i].Flags |= FlagInvalid
l.Warnf("File name %q contains invalid characters; marked as invalid.", f.Name) l.Warnf("File name %q (folder %q) contains invalid characters; marked as invalid.", f.Name, folder)
} }
files[i].Name = filepath.FromSlash(files[i].Name) files[i].Name = filepath.FromSlash(files[i].Name)
} }