cotugno/syncthing
2
Fork 0
mirror of https://github.com/syncthing/syncthing.git synced 2024-11-16 18:41:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Exit and error if the target is not a directory

Browse Source
This commit is contained in:
Lode Hoste 2015-03-05 22:14:00 +01:00
parent 6057138466
commit 19884ade99
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/osutil/osutil.go
View File

@ -69,7 +69,14 @@ func Copy(from, to string) (err error) {
// containing `path` is writable for the duration of the call. // containing `path` is writable for the duration of the call.
func InWritableDir(fn func(string) error, path string) error { func InWritableDir(fn func(string) error, path string) error {
dir := filepath.Dir(path) dir := filepath.Dir(path)
if info, err := os.Stat(dir); err == nil && info.IsDir() && info.Mode()&0200 == 0 { info, err := os.Stat(dir)
if err != nil {
return err
}
if !info.IsDir() {
return errors.New("Not a directory: " + path)
}
if info.Mode()&0200 == 0 {
// A non-writeable directory (for this user; we assume that's the // A non-writeable directory (for this user; we assume that's the
// relevant part). Temporarily change the mode so we can delete the // relevant part). Temporarily change the mode so we can delete the
// file or directory inside it. // file or directory inside it.