Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

exec: change exec.PathError to exec.Error

Browse source 
There were two issues:
1) It might not be a path error, it might be 'permission denied'.
2) The concept of $PATH is Unix-specific.

R=alex.brainman, rsc, r, mattn.jp
CC=golang-dev
https://golang.org/cl/4530096
This commit is contained in:
Rob Pike 2011-06-03 07:48:06 +10:00
parent 31c79c4eff
commit 4e9e925002
4 changed files with 51 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/pkg/exec/lp_unix.go
View file

@ -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.ErrorString("executable file not found in $PATH")
func findExecutable(file string) os.Error {
d, err := os.Stat(file)
if err != nil {
return false
return err
}
return d.IsRegular() && d.Permission()&0111 != 0
if d.IsRegular() && d.Permission()&0111 != 0 {
return nil
}
return os.EPERM
}
// LookPath searches for an executable binary named file
@ -26,10 +32,11 @@ 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) {
@ -37,9 +44,9 @@ func LookPath(file string) (string, os.Error) {
// 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}
}