Fix handling of Env on execve

Author: DQNEO

internal/sema/sema.go

@@ -1508,11 +1508,6 @@ func walkCallExpr(e *ast.CallExpr, ctx *ir.EvalContext) ir.MetaExpr {
 			case "runtime_args":
 				symbol = GetPackageSymbol("runtime", "runtime_args")
 			}
-		case "syscall":
-			switch fn.Name {
-			case "runtime_getenv":
-				symbol = GetPackageSymbol("runtime", "runtime_getenv")
-			}
 		case "runtime":
 			if fn.Name == "makeSlice1" || fn.Name == "makeSlice8" || fn.Name == "makeSlice16" || fn.Name == "makeSlice24" {
 				fn.Name = "makeSlice"

src/os/exec/exec.go

@@ -95,14 +95,12 @@ func execve(cmds string, args []string) {
 	argv = append(argv, 0)
 	argvAddr := uintptr(unsafe.Pointer(&argv[0]))
 
+	environ := syscall.Environ()
 	var envp []uintptr
-	gopathenvstr := "GOPATH=" + os.Getenv("GOPATH")
-	gopathenv := append([]byte(gopathenvstr), 0)
-	envp = append(envp, uintptr(unsafe.Pointer(&gopathenv[0])))
-	workdirenvstr := "WORKDIR=" + os.Getenv("WORKDIR")
-	workdirenv := append([]byte(workdirenvstr), 0)
-	envp = append(envp, uintptr(unsafe.Pointer(&workdirenv[0])))
-
+	for _, envLine := range environ {
+		bufEnvLine := []byte(envLine)
+		envp = append(envp, uintptr(unsafe.Pointer(&bufEnvLine[0])))
+	}
 	envp = append(envp, 0)
 	envpAddr := uintptr(unsafe.Pointer(&envp[0]))
 	syscall.Syscall(trap, pathname, argvAddr, envpAddr)

src/os/os.go

@@ -172,6 +172,10 @@ func Getenv(key string) string {
 	return v
 }
 
+func Environ() []string {
+	return syscall.Environ()
+}
+
 func Exit(status int) {
 	syscall.Syscall(uintptr(SYS_EXIT), uintptr(status), 0, 0)
 }

src/runtime/runtime.go

@@ -106,7 +106,7 @@ func mstart0() {
 
 // Environment variables
 var envp uintptr
-var envlines []string // []{"FOO=BAR\0", "HOME=/home/...\0", ..}
+var Envlines []string // []{"FOO=BAR\0", "HOME=/home/...\0", ..}
 
 type EnvEntry struct {
 	Key   string
@@ -136,10 +136,10 @@ func envInit() {
 		if *bpp == nil {
 			break
 		}
-		envlines = append(envlines, cstring2string(*bpp))
+		Envlines = append(Envlines, cstring2string(*bpp))
 	}
 
-	for _, envline := range envlines {
+	for _, envline := range Envlines {
 		var i int
 		var c byte
 		for i, c = range []byte(envline) {

src/syscall/syscall.go

@@ -23,6 +23,10 @@ func Getenv(key string) (string, bool) {
 	return "", false
 }
 
+func Environ() []string {
+	return runtime.Envlines
+}
+
 func Read(fd int, buf []byte) (uintptr, error) {
 	p := &buf[0]
 	_cap := cap(buf)