mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

runtime: fix gogetenv on Plan 9 

LGTM=rsc
R=rsc, ality
CC=golang-codereviews
https://golang.org/cl/137030043
This commit is contained in:
David du Colombier 2014-09-01 23:03:26 -04:00 committed by Russ Cox
parent 649c83530a
commit 20d9cc4bb0
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pkg/runtime/env_plan9.go
View File

@ -30,21 +30,11 @@ func gogetenv(key string) string {
if fd < 0 {
return ""
}
n := seek(fd, 0, 2)
n := seek(fd, 0, 2) - 1
var p unsafe.Pointer
p := make([]byte, n)
// Be sure not to allocate for $GOTRACEBACK.
if key == "GOTRACEBACK" {
if n >= 128 {
return ""
}
p = unsafe.Pointer(&tracebackbuf[0])
} else {
p = gomallocgc(uintptr(n+1), nil, 0)
}
r := pread(fd, p, int32(n), 0)
r := pread(fd, unsafe.Pointer(&p[0]), int32(n), 0)
close(fd)
if r < 0 {
return ""
@ -52,7 +42,7 @@ func gogetenv(key string) string {
var s string
sp := (*_string)(unsafe.Pointer(&s))
sp.str = (*byte)(p)
sp.str = &p[0]
sp.len = int(r)
return s
}