mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
os/exec: LookPath on Unix shouldn't look in cwd when PATH is empty
R=golang-dev, dave, bradfitz CC=golang-dev https://golang.org/cl/7305053
This commit is contained in:
parent
80e1cf73eb
commit
fe7dbea00e
2 changed files with 55 additions and 0 deletions
|
|
@ -42,6 +42,9 @@ func LookPath(file string) (string, error) {
|
||||||
return "", &Error{file, err}
|
return "", &Error{file, err}
|
||||||
}
|
}
|
||||||
pathenv := os.Getenv("PATH")
|
pathenv := os.Getenv("PATH")
|
||||||
|
if pathenv == "" {
|
||||||
|
return "", &Error{file, ErrNotFound}
|
||||||
|
}
|
||||||
for _, dir := range strings.Split(pathenv, ":") {
|
for _, dir := range strings.Split(pathenv, ":") {
|
||||||
if dir == "" {
|
if dir == "" {
|
||||||
// Unix shell semantics: path element "" means "."
|
// Unix shell semantics: path element "" means "."
|
||||||
|
|
|
||||||
52
src/pkg/os/exec/lp_unix_test.go
Normal file
52
src/pkg/os/exec/lp_unix_test.go
Normal file
|
|
@ -0,0 +1,52 @@
|
||||||
|
// Copyright 2013 The Go Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a BSD-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
// +build darwin freebsd linux netbsd openbsd
|
||||||
|
|
||||||
|
package exec
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io/ioutil"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestLookPathUnixEmptyPath(t *testing.T) {
|
||||||
|
tmp, err := ioutil.TempDir("", "TestLookPathUnixEmptyPath")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("TempDir failed: ", err)
|
||||||
|
}
|
||||||
|
defer os.RemoveAll(tmp)
|
||||||
|
wd, err := os.Getwd()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("Getwd failed: ", err)
|
||||||
|
}
|
||||||
|
err = os.Chdir(tmp)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("Chdir failed: ", err)
|
||||||
|
}
|
||||||
|
defer os.Chdir(wd)
|
||||||
|
|
||||||
|
f, err := os.OpenFile("exec_me", os.O_CREATE|os.O_EXCL, 0700)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("OpenFile failed: ", err)
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
|
||||||
|
pathenv := os.Getenv("PATH")
|
||||||
|
defer os.Setenv("PATH", pathenv)
|
||||||
|
|
||||||
|
err = os.Setenv("PATH", "")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("Setenv failed: ", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
path, err := LookPath("exec_me")
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("LookPath found exec_me in empty $PATH")
|
||||||
|
}
|
||||||
|
if path != "" {
|
||||||
|
t.Fatalf("LookPath path == %q when err != nil", path)
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue