Commit 002bc94

committed

internal/syscall/execenv: refactor handling env variables

Discover while working on CL 471335. Change-Id: I006077a5aa93cafb7be47813ab0c4714bb00d774 Reviewed-on: https://go-review.googlesource.com/c/go/+/471435 Reviewed-by: Than McIntosh <thanm@google.com> Reviewed-by: Ian Lance Taylor <iant@golang.org> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Bryan Mills <bcmills@google.com>

1 parent de8c999 commit 002bc94Copy full SHA for 002bc94

File tree

1 file changed

-15

lines changed

src/internal/syscall/execenv
- execenv_windows.go

1 file changed

-15

lines changed

`‎src/internal/syscall/execenv/execenv_windows.go‎`

Lines changed: 9 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,30 +25,24 @@ func Default(sys *syscall.SysProcAttr) (env []string, err error) {`
`25`	`25`	`if sys == nil \|\| sys.Token == 0 {`
`26`	`26`	`return syscall.Environ(), nil`
`27`	`27`	`}`
`28`		`- var block *uint16`
`29`		`- err = windows.CreateEnvironmentBlock(&block, sys.Token, false)`
	`28`	`+ var blockp *uint16`
	`29`	`+ err = windows.CreateEnvironmentBlock(&blockp, sys.Token, false)`
`30`	`30`	`if err != nil {`
`31`	`31`	`return nil, err`
`32`	`32`	`}`
`33`		`- defer windows.DestroyEnvironmentBlock(block)`
`34`		`- blockp := uintptr(unsafe.Pointer(block))`
`35`		`- for {`
	`33`	`+ defer windows.DestroyEnvironmentBlock(blockp)`
`36`	`34`
	`35`	`+ const size = unsafe.Sizeof(*blockp)`
	`36`	`+ for *blockp != 0 { // environment block ends with empty string`
`37`	`37`	`// find NUL terminator`
`38`		`- end := unsafe.Pointer(blockp)`
	`38`	`+ end := unsafe.Add(unsafe.Pointer(blockp), size)`
`39`	`39`	`for (uint16)(end) != 0 {`
`40`		`- end = unsafe.Pointer(uintptr(end) +2)`
	`40`	`+ end = unsafe.Add(end, size)`
`41`	`41`	`}`
`42`	`42`
`43`		`- n := (uintptr(end) - uintptr(unsafe.Pointer(blockp))) / 2`
`44`		`- if n == 0 {`
`45`		`- // environment block ends with empty string`
`46`		`- break`
`47`		`- }`
`48`		`-`
`49`		`- entry := (*[(1 << 30) - 1]uint16)(unsafe.Pointer(blockp))[:n:n]`
	`43`	`+ entry := unsafe.Slice(blockp, (uintptr(end)-uintptr(unsafe.Pointer(blockp)))/2)`
`50`	`44`	`env = append(env, string(utf16.Decode(entry)))`
`51`		`- blockp +=2* (uintptr(len(entry)) +1)`
	`45`	`+ blockp = (*uint16)(unsafe.Add(end, size))`
`52`	`46`	`}`
`53`	`47`	`return`
`54`	`48`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 002bc94

File tree

1 file changed

1 file changed

`‎src/internal/syscall/execenv/execenv_windows.go‎`

0 commit comments