mirror of
https://github.com/golang/go
synced 2024-11-15 01:20:28 -07:00
net,os: use os.LookupEnv instead of syscall.Getenv
The os package already has a function for retrieving an environment
variable with a ok boolean, we don't need to use syscall directly.
Change-Id: Ife873e7245261ec765b628e31a0e7a7bc4dff934
GitHub-Last-Rev: bc5f30bf56
GitHub-Pull-Request: golang/go#69700
Reviewed-on: https://go-review.googlesource.com/c/go/+/616342
Reviewed-by: Michael Knyszek <mknyszek@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
This commit is contained in:
parent
869932d700
commit
0fb33863b7
@ -13,7 +13,6 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"runtime"
|
"runtime"
|
||||||
"sync"
|
"sync"
|
||||||
"syscall"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// The net package's name resolution is rather complicated.
|
// The net package's name resolution is rather complicated.
|
||||||
@ -138,7 +137,7 @@ func initConfVal() {
|
|||||||
// prefer the cgo resolver.
|
// prefer the cgo resolver.
|
||||||
// Note that LOCALDOMAIN can change behavior merely by being
|
// Note that LOCALDOMAIN can change behavior merely by being
|
||||||
// specified with the empty string.
|
// specified with the empty string.
|
||||||
_, localDomainDefined := syscall.Getenv("LOCALDOMAIN")
|
_, localDomainDefined := os.LookupEnv("LOCALDOMAIN")
|
||||||
if localDomainDefined || os.Getenv("RES_OPTIONS") != "" || os.Getenv("HOSTALIASES") != "" {
|
if localDomainDefined || os.Getenv("RES_OPTIONS") != "" || os.Getenv("HOSTALIASES") != "" {
|
||||||
confVal.preferCgo = true
|
confVal.preferCgo = true
|
||||||
return
|
return
|
||||||
|
@ -10,7 +10,6 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"syscall"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// ErrNotFound is the error resulting if a path search failed to find an executable file.
|
// ErrNotFound is the error resulting if a path search failed to find an executable file.
|
||||||
@ -154,7 +153,7 @@ func lookPath(file string, exts []string) (string, error) {
|
|||||||
dotf string
|
dotf string
|
||||||
dotErr error
|
dotErr error
|
||||||
)
|
)
|
||||||
if _, found := syscall.Getenv("NoDefaultCurrentDirectoryInExePath"); !found {
|
if _, found := os.LookupEnv("NoDefaultCurrentDirectoryInExePath"); !found {
|
||||||
if f, err := findExecutable(filepath.Join(".", file), exts); err == nil {
|
if f, err := findExecutable(filepath.Join(".", file), exts); err == nil {
|
||||||
if execerrdot.Value() == "0" {
|
if execerrdot.Value() == "0" {
|
||||||
execerrdot.IncNonDefault()
|
execerrdot.IncNonDefault()
|
||||||
|
Loading…
Reference in New Issue
Block a user