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

os: rename only works as part of the same directory on Plan 9

Browse Source 
R=golang-dev, lucio.dere, rsc
CC=golang-dev
https://golang.org/cl/44080046
This commit is contained in:
David du Colombier 2013-12-19 21:20:03 +01:00
parent 6f6ff95183
commit 16dcef80d4
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pkg/os/file_plan9.go
View File

@ -6,6 +6,7 @@ package os
import (
"runtime"
"strings"
"syscall"
"time"
)
@ -314,6 +315,15 @@ func Remove(name string) error {
}
func rename(oldname, newname string) error {
dirname := oldname[:strings.LastIndex(oldname, "/")+1]
if strings.HasPrefix(newname, dirname) {
newname = newname[len(dirname):]
}
// If newname still contains slashes after removing the oldname
// prefix, the rename is cross-directory and must be rejected.
// This case is caught by d.Marshal below.
var d syscall.Dir
d.Null()
@ -322,10 +332,10 @@ func rename(oldname, newname string) error {
buf := make([]byte, syscall.STATFIXLEN+len(d.Name))
n, err := d.Marshal(buf[:])
if err != nil {
return &PathError{"rename", oldname, err}
return &LinkError{"rename", oldname, newname, err}
}
if err = syscall.Wstat(oldname, buf[:n]); err != nil {
return &PathError{"rename", oldname, err}
return &LinkError{"rename", oldname, newname, err}
}
return nil
}