code review 4253052: os, syscall: add ProcAttributes type. Change StartProce...

src/pkg/syscall/exec_windows.go

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // Fork, exec, wait, etc.
 
 package syscall
 
 import (
         "sync"
@@ skipping 96 matching lines @@
 
 
 func CloseOnExec(fd int) {
         SetHandleInformation(int32(fd), HANDLE_FLAG_INHERIT, 0)
 }
 
 func SetNonblock(fd int, nonblocking bool) (errno int) {
         return 0
 }
 
-type ProcAttributes struct {
-        dir string
-}
-
-func (a *ProcAttributes) Chdir(dir string) {
-        a.dir = dir
-}
-
-var zeroAttributes ProcAttributes
+type ProcAttr struct {
+        Dir   string
+        Env   []string
+        Files []int
+}
+
+var zeroAttributes ProcAttr
 
 // TODO(kardia): Add trace
 //The command and arguments are passed via the Command line parameter.
-func StartProcess(argv0 string, argv []string, envv []string, fd []int, attrs *ProcAttributes) (pid, handle int, err int) {
-        if len(fd) > 3 {
+func StartProcess(argv0 string, argv []string, attr *ProcAttr) (pid, handle int, err int) {
+        if attr == nil {
+                attr = &zeroAttributes
+        }
+        if len(attr.Files) > 3 {
                 return 0, 0, EWINDOWS
-        }
-        if attrs == nil {
-                attrs = &zeroAttributes
         }
 
         // CreateProcess will throw an error if the dir is not set to a valid dir
         // thus get the working dir if dir is empty.
-        if attrs.dir != "" {

[brainman, 2011/03/04 00:02:16]

You reversed condition here. I think it is mistake.

+        dir := attr.Dir
+        if dir == "" {
                 if wd, ok := Getwd(); ok == 0 {
                         dir = wd
                 }
         }
+        fd := attr.Files
 
         startupInfo := new(StartupInfo)
         processInfo := new(ProcessInformation)
 
         GetStartupInfo(startupInfo)
 
         startupInfo.Flags = STARTF_USESTDHANDLES
         startupInfo.StdInput = 0
         startupInfo.StdOutput = 0
         startupInfo.StdErr = 0
@@ skipping 31 matching lines @@
         }
         // argv0 must not be longer then 256 chars
         // but the entire cmd line can have up to 32k chars (msdn)
         err = CreateProcess(
                 nil,
                 StringToUTF16Ptr(escapeAddQuotes(argv0)+" "+stringJoin(argv[1:], " ", escapeAddQuotes)),
                 nil,  //ptr to struct lpProcessAttributes
                 nil,  //ptr to struct lpThreadAttributes
                 true, //bInheritHandles
                 CREATE_UNICODE_ENVIRONMENT, //Flags
-                createEnvBlock(envv),       //env block, NULL uses parent env
-                StringToUTF16Ptr(attrs.dir),
+                createEnvBlock(attr.Env),   //env block, NULL uses parent env
+                StringToUTF16Ptr(dir),
                 startupInfo,
                 processInfo)
 
         if err == 0 {
                 pid = int(processInfo.ProcessId)
                 handle = int(processInfo.Process)
                 CloseHandle(processInfo.Thread)
         }
         return
 }
 
 // Ordinary exec.
 func Exec(argv0 string, argv []string, envv []string) (err int) {
         return EWINDOWS
 }