qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 14:44:41 -07:00
Code Releases Activity

os: lstat oldname before renaming

Browse Source 
Fixes #19647

Change-Id: Ife4f98cf2c55ee9490843797213dae2f2647b0a3
Reviewed-on: https://go-review.googlesource.com/40577
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Alexander Menzhinsky 2017-04-13 11:23:35 -05:00 committed by Brad Fitzpatrick
parent 1ea796ee69
commit 0f0a51f1d1
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/os/file_unix.go
View File

@ -20,11 +20,20 @@ func fixLongPath(path string) string {
func rename(oldname, newname string) error { func rename(oldname, newname string) error {
fi, err := Lstat(newname) fi, err := Lstat(newname)
if err == nil && fi.IsDir() { if err == nil && fi.IsDir() {
// if we cannot stat oldname we should
// return that error in favor of EEXIST
fi, err = Lstat(oldname)
if err != nil {
if pErr, ok := err.(*PathError); ok {
err = pErr.Err
}
return &LinkError{"rename", oldname, newname, err}
}
return &LinkError{"rename", oldname, newname, syscall.EEXIST} return &LinkError{"rename", oldname, newname, syscall.EEXIST}
} }
e := syscall.Rename(oldname, newname) err = syscall.Rename(oldname, newname)
if e != nil { if err != nil {
return &LinkError{"rename", oldname, newname, e} return &LinkError{"rename", oldname, newname, err}
} }
return nil return nil
} }

12
src/os/os_test.go
View File

@ -886,6 +886,18 @@ func TestRenameFailed(t *testing.T) {
} }
} }
func TestRenameNotExisting(t *testing.T) {
defer chtmpdir(t)()
from, to := "doesnt-exist", "dest"
Mkdir(to, 0777)
defer Remove(to)
if err := Rename(from, to); !IsNotExist(err) {
t.Errorf("Rename(%q, %q) = %v; want an IsNotExist error", from, to, err)
}
}
func TestRenameToDirFailed(t *testing.T) { func TestRenameToDirFailed(t *testing.T) {
defer chtmpdir(t)() defer chtmpdir(t)()
from, to := "renamefrom", "renameto" from, to := "renamefrom", "renameto"