summaryrefslogtreecommitdiffhomepage
path: root/runsc
diff options
context:
space:
mode:
authorDean Deng <deandeng@google.com>2021-01-13 15:10:03 -0800
committergVisor bot <gvisor-bot@google.com>2021-01-13 15:15:20 -0800
commit1efe0ebc5973ec8a06b881c087dae2183898504b (patch)
tree6587b91164883c87324abe602b438f3e3ace19cf /runsc
parentf34aaf7ef17aa10c7ba1923d0694347e47634192 (diff)
Switch uses of os.Getenv that check for empty string to os.LookupEnv.
Whether the variable was found is already returned by syscall.Getenv. os.Getenv drops this value while os.Lookupenv passes it along. PiperOrigin-RevId: 351674032
Diffstat (limited to 'runsc')
-rw-r--r--runsc/cmd/gofer_test.go7
-rw-r--r--runsc/config/flags.go2
2 files changed, 4 insertions, 5 deletions
diff --git a/runsc/cmd/gofer_test.go b/runsc/cmd/gofer_test.go
index cbea7f127..fea62a4f4 100644
--- a/runsc/cmd/gofer_test.go
+++ b/runsc/cmd/gofer_test.go
@@ -24,11 +24,10 @@ import (
)
func tmpDir() string {
- dir := os.Getenv("TEST_TMPDIR")
- if dir == "" {
- dir = "/tmp"
+ if dir, ok := os.LookupEnv("TEST_TMPDIR"); ok {
+ return dir
}
- return dir
+ return "/tmp"
}
type dir struct {
diff --git a/runsc/config/flags.go b/runsc/config/flags.go
index 02ab9255a..7e738dfdf 100644
--- a/runsc/config/flags.go
+++ b/runsc/config/flags.go
@@ -114,7 +114,7 @@ func NewFromFlags() (*Config, error) {
if len(conf.RootDir) == 0 {
// If not set, set default root dir to something (hopefully) user-writeable.
conf.RootDir = "/var/run/runsc"
- if runtimeDir := os.Getenv("XDG_RUNTIME_DIR"); runtimeDir != "" {
+ if runtimeDir, ok := os.LookupEnv("XDG_RUNTIME_DIR"); ok {
conf.RootDir = filepath.Join(runtimeDir, "runsc")
}
}