From: Russ Cox <rsc@golang.org>
Date: Tue, 14 Apr 2009 02:14:09 +0000 (-0700)
Subject: fix error return in Remove
X-Git-Tag: weekly.2009-11-06~1848
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9b3f43774a4f39ebb4d97bc4e76fc67a4388ae33;p=gostls13.git

fix error return in Remove
change canexec to canExec.

R=r
DELTA=7  (0 added, 0 deleted, 7 changed)
OCL=27393
CL=27398
---

diff --git a/src/lib/exec.go b/src/lib/exec.go
index effb46fa45..425b94eb3a 100644
--- a/src/lib/exec.go
+++ b/src/lib/exec.go
@@ -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;
 		}
 	}
diff --git a/src/lib/os/file.go b/src/lib/os/file.go
index 80f43bb593..9e98be697a 100644
--- a/src/lib/os/file.go
+++ b/src/lib/os/file.go
@@ -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);
 }