From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Tue, 3 May 2011 03:08:27 +0000 (-0400)
Subject: os: remove race paranoia from Environ(); it's guarded now
X-Git-Tag: weekly.2011-05-22~163
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ec1ee024adbd673d2422c7640ad16b4cdd5d41f1;p=gostls13.git

os: remove race paranoia from Environ(); it's guarded now

R=rsc
CC=golang-dev
https://golang.org/cl/4426077
---

diff --git a/src/pkg/os/env_unix.go b/src/pkg/os/env_unix.go
index 6a8a0b17fe..8aa71e83a0 100644
--- a/src/pkg/os/env_unix.go
+++ b/src/pkg/os/env_unix.go
@@ -94,14 +94,10 @@ func Environ() []string {
 	a := make([]string, len(env))
 	i := 0
 	for k, v := range env {
-		// check i < len(a) for safety,
-		// in case env is changing underfoot.
-		if i < len(a) {
-			a[i] = k + "=" + v
-			i++
-		}
+		a[i] = k + "=" + v
+		i++
 	}
-	return a[0:i]
+	return a
 }
 
 // TempDir returns the default directory to use for temporary files.