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

fix error return in Remove

Browse Source 
change canexec to canExec.

R=r
DELTA=7  (0 added, 0 deleted, 7 changed)
OCL=27393
CL=27398
This commit is contained in:
Russ Cox 2009-04-13 19:14:09 -07:00
parent 5eae3b2102
commit 9b3f43774a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/exec.go
View File

@ -184,7 +184,7 @@ func (p *Cmd) Close() *os.Error {
return err;
}
func canexec(file string) bool{
func canExec(file string) bool{
d, err := os.Stat(file);
if err != nil {
return false;
@ -203,7 +203,7 @@ func LookPath(file string) (string, *os.Error) {
// but that would not match all the Unix shells.
if strings.Index(file, "/") >= 0 {
if canexec(file) {
if canExec(file) {
return file, nil;
}
return "", os.ENOENT;
@ -219,7 +219,7 @@ func LookPath(file string) (string, *os.Error) {
// Unix shell semantics: path element "" means "."
dir = ".";
}
if canexec(dir+"/"+file) {
if canExec(dir+"/"+file) {
return dir+"/"+file, nil;
}
}

4
src/lib/os/file.go
View File

@ -287,13 +287,13 @@ func Remove(name string) *os.Error {
// returns EISDIR, so can't use that. However,
// both agree that rmdir(file) returns ENOTDIR,
// so we can use that to decide which error is real.
// Rmdir might return ENOTDIR if given a bad
// Rmdir might also return ENOTDIR if given a bad
// file path, like /etc/passwd/foo, but in that case,
// both errors will be ENOTDIR, so it's okay to
// use the error from unlink.
if e1 != syscall.ENOTDIR {
e = e1;
}
return ErrnoToError(e1);
return ErrnoToError(e);
}