extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-12-24 07:59:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add mutex to "warned" map.

Browse Source 
Fixes #385
This commit is contained in:
Klaus Post 2016-03-10 15:51:56 +01:00
parent fdd4b4ee22
commit e57c4406f3
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
local/local.go
View File

@ -42,6 +42,7 @@ type Fs struct {
root string // The root directory root string // The root directory
precisionOk sync.Once // Whether we need to read the precision precisionOk sync.Once // Whether we need to read the precision
precision time.Duration // precision of local filesystem precision time.Duration // precision of local filesystem
wmu sync.Mutex // used for locking access to 'warned'.
warned map[string]struct{} // whether we have warned about this string warned map[string]struct{} // whether we have warned about this string
nounc bool // Skip UNC conversion on Windows nounc bool // Skip UNC conversion on Windows
} }
@ -175,10 +176,12 @@ func (f *Fs) List() fs.ObjectsChan {
// Any invalid UTF-8 characters will be replaced with utf8.RuneError // Any invalid UTF-8 characters will be replaced with utf8.RuneError
func (f *Fs) cleanUtf8(name string) string { func (f *Fs) cleanUtf8(name string) string {
if !utf8.ValidString(name) { if !utf8.ValidString(name) {
f.wmu.Lock()
if _, ok := f.warned[name]; !ok { if _, ok := f.warned[name]; !ok {
fs.Debug(f, "Replacing invalid UTF-8 characters in %q", name) fs.Debug(f, "Replacing invalid UTF-8 characters in %q", name)
f.warned[name] = struct{}{} f.warned[name] = struct{}{}
} }
f.wmu.Unlock()
name = string([]rune(name)) name = string([]rune(name))
} }
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
@ -706,10 +709,12 @@ func cleanWindowsName(f *Fs, name string) string {
}, name) }, name)
if name2 != original && f != nil { if name2 != original && f != nil {
f.wmu.Lock()
if _, ok := f.warned[name]; !ok { if _, ok := f.warned[name]; !ok {
fs.Debug(f, "Replacing invalid characters in %q to %q", name, name2) fs.Debug(f, "Replacing invalid characters in %q to %q", name, name2)
f.warned[name] = struct{}{} f.warned[name] = struct{}{}
} }
f.wmu.Unlock()
} }
return name2 return name2
} }