Update Go library to r60.

[pf3gnuchains/gcc-fork.git] / libgo / go / exec / lp_unix.go

diff --git a/libgo/go/exec/lp_unix.go b/libgo/go/exec/lp_unix.go
index 44f8434..008fb11 100644 (file)
--- a/libgo/go/exec/lp_unix.go
+++ b/libgo/go/exec/lp_unix.go
@@ -9,12 +9,18 @@ import (
        "strings"
 )
 
-func canExec(file string) bool {
+// ErrNotFound is the error resulting if a path search failed to find an executable file.
+var ErrNotFound = os.NewError("executable file not found in $PATH")
+
+func findExecutable(file string) os.Error {
        d, err := os.Stat(file)
        if err != nil {
-               return false
+               return err
+       }
+       if d.IsRegular() && d.Permission()&0111 != 0 {
+               return nil
        }
-       return d.IsRegular() && d.Permission()&0111 != 0
+       return os.EPERM
 }
 
 // LookPath searches for an executable binary named file
@@ -26,20 +32,21 @@ func LookPath(file string) (string, os.Error) {
        // but that would not match all the Unix shells.
 
        if strings.Contains(file, "/") {
-               if canExec(file) {
+               err := findExecutable(file)
+               if err == nil {
                        return file, nil
                }
-               return "", &PathError{file}
+               return "", &Error{file, err}
        }
        pathenv := os.Getenv("PATH")
-       for _, dir := range strings.Split(pathenv, ":", -1) {
+       for _, dir := range strings.Split(pathenv, ":") {
                if dir == "" {
                        // Unix shell semantics: path element "" means "."
                        dir = "."
                }
-               if canExec(dir + "/" + file) {
+               if err := findExecutable(dir + "/" + file); err == nil {
                        return dir + "/" + file, nil
                }
        }
-       return "", &PathError{file}
+       return "", &Error{file, ErrNotFound}
 }