Commit 9b3f4377 authored by Russ Cox's avatar Russ Cox

fix error return in Remove

change canexec to canExec.

R=r
DELTA=7  (0 added, 0 deleted, 7 changed)
OCL=27393
CL=27398
parent 5eae3b21
...@@ -184,7 +184,7 @@ func (p *Cmd) Close() *os.Error { ...@@ -184,7 +184,7 @@ func (p *Cmd) Close() *os.Error {
return err; return err;
} }
func canexec(file string) bool{ func canExec(file string) bool{
d, err := os.Stat(file); d, err := os.Stat(file);
if err != nil { if err != nil {
return false; return false;
...@@ -203,7 +203,7 @@ func LookPath(file string) (string, *os.Error) { ...@@ -203,7 +203,7 @@ func LookPath(file string) (string, *os.Error) {
// but that would not match all the Unix shells. // but that would not match all the Unix shells.
if strings.Index(file, "/") >= 0 { if strings.Index(file, "/") >= 0 {
if canexec(file) { if canExec(file) {
return file, nil; return file, nil;
} }
return "", os.ENOENT; return "", os.ENOENT;
...@@ -219,7 +219,7 @@ func LookPath(file string) (string, *os.Error) { ...@@ -219,7 +219,7 @@ func LookPath(file string) (string, *os.Error) {
// Unix shell semantics: path element "" means "." // Unix shell semantics: path element "" means "."
dir = "."; dir = ".";
} }
if canexec(dir+"/"+file) { if canExec(dir+"/"+file) {
return dir+"/"+file, nil; return dir+"/"+file, nil;
} }
} }
......
...@@ -287,13 +287,13 @@ func Remove(name string) *os.Error { ...@@ -287,13 +287,13 @@ func Remove(name string) *os.Error {
// returns EISDIR, so can't use that. However, // returns EISDIR, so can't use that. However,
// both agree that rmdir(file) returns ENOTDIR, // both agree that rmdir(file) returns ENOTDIR,
// so we can use that to decide which error is real. // 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, // file path, like /etc/passwd/foo, but in that case,
// both errors will be ENOTDIR, so it's okay to // both errors will be ENOTDIR, so it's okay to
// use the error from unlink. // use the error from unlink.
if e1 != syscall.ENOTDIR { if e1 != syscall.ENOTDIR {
e = e1; e = e1;
} }
return ErrnoToError(e1); return ErrnoToError(e);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment