Merge pull request #61 from darrenstahlmsft/RemoveOldAPI

Deleting old API in preparation for v0.4.0
microsoft · Aug 10, 2016 · 6a6862b · 6a6862b
2 parents 7b7051e + 4f10c13
commit 6a6862b
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 292 deletions.
diff --git a/createcomputesystem.go b/createcomputesystem.go
diff --git a/createprocess.go b/createprocess.go
diff --git a/getcomputesystemproperties.go b/getcomputesystemproperties.go
diff --git a/resizeconsole.go b/resizeconsole.go
diff --git a/shutdownterminatecomputesystem.go b/shutdownterminatecomputesystem.go
diff --git a/startcomputesystem.go b/startcomputesystem.go
diff --git a/terminateprocess.go b/terminateprocess.go
diff --git a/utils.go b/utils.go
@@ -1,11 +1,39 @@
 package hcsshim
 
 import (
+	"io"
 	"syscall"
+
+	"github.com/Microsoft/go-winio"
 )
 
 var (
 	vmcomputedll          = syscall.NewLazyDLL("vmcompute.dll")
 	hcsCallbackAPI        = vmcomputedll.NewProc("HcsRegisterComputeSystemCallback")
 	hcsCallbacksSupported = hcsCallbackAPI.Find() == nil
 )
+
+// makeOpenFiles calls winio.MakeOpenFile for each handle in a slice but closes all the handles
+// if there is an error.
+func makeOpenFiles(hs []syscall.Handle) (_ []io.ReadWriteCloser, err error) {
+	fs := make([]io.ReadWriteCloser, len(hs))
+	for i, h := range hs {
+		if h != syscall.Handle(0) {
+			if err == nil {
+				fs[i], err = winio.MakeOpenFile(h)
+			}
+			if err != nil {
+				syscall.Close(h)
+			}
+		}
+	}
+	if err != nil {
+		for _, f := range fs {
+			if f != nil {
+				f.Close()
+			}
+		}
+		return nil, err
+	}
+	return fs, nil
+}
diff --git a/waitprocess.go b/waitprocess.go