Gop_Env

bufiox/bufio.go

@@ -1,3 +1,19 @@
+/*
+ Copyright 2020 Qiniu Limited (qiniu.com)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
 package bufiox
 
 import (
@@ -10,13 +26,13 @@ import (
 
 // -----------------------------------------------------------------------------
 
-type nilReaderImpl int
+type nilReaderImpl struct{}
 
 func (p nilReaderImpl) Read(b []byte) (n int, err error) {
 	return 0, io.EOF
 }
 
-var nilReader io.Reader = nilReaderImpl(0)
+var nilReader io.Reader = nilReaderImpl{}
 
 // -----------------------------------------------------------------------------
 
@@ -82,7 +98,6 @@ var ErrSeekUnsupported = errors.New("bufio: the underlying reader doesn't suppor
 // SeekCurrent means relative to the current offset, and SeekEnd means
 // relative to the end. Seek returns the new offset relative to the start
 // of the file and an error, if any.
-//
 func Seek(b *bufio.Reader, offset int64, whence int) (int64, error) {
 	r := getUnderlyingReader(b)
 	if seeker, ok := r.(io.Seeker); ok {

bufiox/bufio_test.go

@@ -1,3 +1,19 @@
+/*
+ Copyright 2020 Qiniu Limited (qiniu.com)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
 package bufiox
 
 import (
@@ -13,12 +29,17 @@ import (
 
 func TestReaderSize(t *testing.T) {
 	b1 := NewReaderBuffer(nil)
-	size1 := unsafe.Sizeof(*b1)
 	b2 := bufio.NewReader(os.Stdin)
-	size2 := unsafe.Sizeof(*b2)
-	if size1 != size2 {
+	_ = b2
+	if unsafe.Sizeof(*b1) != unsafe.Sizeof(*b2) {
 		t.Fatal("TestReaderSize: sizeof(bufiox.Reader) != sizeof(bufio.Reader)")
 	}
+	if Buffer(b1) != nil {
+		t.Fatal("Buffer not nil")
+	}
+	if !IsReaderBuffer(b1) {
+		t.Fatal("not IsReaderBuffer?")
+	}
 	b, err := ReadAll(b1)
 	if err != nil || b != nil {
 		t.Fatal("ReadAll failed:", err, b)

bufiox/seek.go

@@ -1,3 +1,19 @@
+/*
+ Copyright 2020 Qiniu Limited (qiniu.com)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
 package bufiox
 
 import (
@@ -24,7 +40,6 @@ func NewReader(rd io.ReadSeeker) *Reader {
 // NewReaderSize returns a new Reader whose buffer has at least the specified
 // size. If the argument io.Reader is already a Reader with large enough size,
 // it returns the underlying Reader.
-//
 func NewReaderSize(rd io.ReadSeeker, size int) *Reader {
 	b, ok := rd.(*Reader)
 	if ok && b.Size() >= size {
@@ -39,7 +54,6 @@ func NewReaderSize(rd io.ReadSeeker, size int) *Reader {
 // SeekCurrent means relative to the current offset, and SeekEnd means
 // relative to the end. Seek returns the new offset relative to the start
 // of the file and an error, if any.
-//
 func (r *Reader) Seek(offset int64, whence int) (int64, error) {
 	return Seek(&r.Reader, offset, whence)
 }

gsh/classfile.go

@@ -44,6 +44,11 @@ func (p *App) initApp() {
 	p.ferr = os.Stderr
 }
 
+// Gop_Env retrieves the value of the environment variable named by the key.
+func (p *App) Gop_Env(key string) string {
+	return Sys.Getenv(key)
+}
+
 func (p *App) execWith(env []string, name string, args ...string) error {
 	cmd := exec.Command(name, args...)
 	cmd.Stdin = p.fin

gsh/env.go

@@ -86,6 +86,11 @@ type OS interface {
 	// variables are replaced by the empty string.
 	ExpandEnv(s string) string
 
+	// Getenv retrieves the value of the environment variable named by the key.
+	// It returns the value, which will be empty if the variable is not present.
+	// To distinguish between an empty value and an unset value, use LookupEnv.
+	Getenv(key string) string
+
 	// Run starts the specified command and waits for it to complete.
 	Run(c *exec.Cmd) error
 }
@@ -102,6 +107,10 @@ func (p defaultOS) ExpandEnv(s string) string {
 	return os.ExpandEnv(s)
 }
 
+func (p defaultOS) Getenv(key string) string {
+	return os.Getenv(key)
+}
+
 func (p defaultOS) Run(c *exec.Cmd) error {
 	return c.Run()
 }

gsh/gsh_test.go

@@ -36,6 +36,10 @@ func (p mockOS) ExpandEnv(s string) string {
 	})
 }
 
+func (p mockOS) Getenv(key string) string {
+	return Getenv(mockEnv, key)
+}
+
 func (p mockOS) Run(c *exec.Cmd) error {
 	if mockEcho {
 		fmt.Fprintln(c.Stdout, c.Env, c.Args)
@@ -91,6 +95,7 @@ func TestOS(t *testing.T) {
 	var sys defaultOS
 	sys.Environ()
 	sys.ExpandEnv("foo")
+	sys.Getenv("foo")
 	sys.Run(new(exec.Cmd))
 }
 
@@ -106,6 +111,9 @@ func TestEnv(t *testing.T) {
 func TestExecWithEnv(t *testing.T) {
 	var app App
 	app.initApp()
+	if v := app.Gop_Env("BAR"); v != "bar" {
+		t.Fatal("app.Gop_Env:", v)
+	}
 	capout(&app, func() {
 		err := app.Exec__0(M{"FOO": "123"}, "./app", "$FOO")
 		check(t, err)