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

Correctly handle ro dirs in ro dirs etc

Browse Source
This commit is contained in:
Jakob Borg
2014-09-28 01:54:25 +02:00
parent 99427d649e
commit 0e2653b7dd
3 changed files with 63 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/model/sharedpullerstate.go
View File

@@ -5,7 +5,6 @@
package model
import (
"fmt"
"os"
"path/filepath"
"sync"
@@ -47,21 +46,13 @@ func (s *sharedPullerState) tempFile() (*os.File, error) {
return s.fd, nil
}
// Ensure that the parent directory exists or can be created
// Ensure that the parent directory is writable. This is
// osutil.InWritableDir except we need to do more stuff so we duplicate it
// here.
dir := filepath.Dir(s.tempName)
if info, err := os.Stat(dir); err != nil && os.IsNotExist(err) {
err = os.MkdirAll(dir, 0755)
if err != nil {
s.earlyCloseLocked("dst mkdir", err)
return nil, err
}
} else if err != nil {
if info, err := os.Stat(dir); err != nil {
s.earlyCloseLocked("dst stat dir", err)
return nil, err
} else if !info.IsDir() {
err = fmt.Errorf("%q: not a directory", dir)
s.earlyCloseLocked("dst mkdir", err)
return nil, err
} else if info.Mode()&04 == 0 {
err := os.Chmod(dir, 0755)
if err == nil {