From ae36924e8c48f9d7570c0660ddea45e7ea53af65 Mon Sep 17 00:00:00 2001 From: Steve Sanders Date: Thu, 13 Sep 2018 15:19:59 -0700 Subject: [PATCH 1/2] use our fork of github.com/Microsoft/go-winio --- .../{Microsoft => keybase}/go-winio/LICENSE | 0 .../{Microsoft => keybase}/go-winio/README.md | 0 .../{Microsoft => keybase}/go-winio/backup.go | 0 .../{Microsoft => keybase}/go-winio/ea.go | 0 .../{Microsoft => keybase}/go-winio/file.go | 2 +- .../{Microsoft => keybase}/go-winio/fileinfo.go | 0 .../{Microsoft => keybase}/go-winio/pipe.go | 0 .../{Microsoft => keybase}/go-winio/privilege.go | 0 .../{Microsoft => keybase}/go-winio/reparse.go | 0 .../{Microsoft => keybase}/go-winio/sd.go | 0 .../{Microsoft => keybase}/go-winio/syscall.go | 0 .../go-winio/zsyscall_windows.go | 0 go/vendor/vendor.json | 15 ++++++++------- 13 files changed, 9 insertions(+), 8 deletions(-) rename go/vendor/github.com/{Microsoft => keybase}/go-winio/LICENSE (100%) rename go/vendor/github.com/{Microsoft => keybase}/go-winio/README.md (100%) rename go/vendor/github.com/{Microsoft => keybase}/go-winio/backup.go (100%) rename go/vendor/github.com/{Microsoft => keybase}/go-winio/ea.go (100%) rename go/vendor/github.com/{Microsoft => keybase}/go-winio/file.go (99%) rename go/vendor/github.com/{Microsoft => keybase}/go-winio/fileinfo.go (100%) rename go/vendor/github.com/{Microsoft => keybase}/go-winio/pipe.go (100%) rename go/vendor/github.com/{Microsoft => keybase}/go-winio/privilege.go (100%) rename go/vendor/github.com/{Microsoft => keybase}/go-winio/reparse.go (100%) rename go/vendor/github.com/{Microsoft => keybase}/go-winio/sd.go (100%) rename go/vendor/github.com/{Microsoft => keybase}/go-winio/syscall.go (100%) rename go/vendor/github.com/{Microsoft => keybase}/go-winio/zsyscall_windows.go (100%) diff --git a/go/vendor/github.com/Microsoft/go-winio/LICENSE b/go/vendor/github.com/keybase/go-winio/LICENSE similarity index 100% rename from go/vendor/github.com/Microsoft/go-winio/LICENSE rename to go/vendor/github.com/keybase/go-winio/LICENSE diff --git a/go/vendor/github.com/Microsoft/go-winio/README.md b/go/vendor/github.com/keybase/go-winio/README.md similarity index 100% rename from go/vendor/github.com/Microsoft/go-winio/README.md rename to go/vendor/github.com/keybase/go-winio/README.md diff --git a/go/vendor/github.com/Microsoft/go-winio/backup.go b/go/vendor/github.com/keybase/go-winio/backup.go similarity index 100% rename from go/vendor/github.com/Microsoft/go-winio/backup.go rename to go/vendor/github.com/keybase/go-winio/backup.go diff --git a/go/vendor/github.com/Microsoft/go-winio/ea.go b/go/vendor/github.com/keybase/go-winio/ea.go similarity index 100% rename from go/vendor/github.com/Microsoft/go-winio/ea.go rename to go/vendor/github.com/keybase/go-winio/ea.go diff --git a/go/vendor/github.com/Microsoft/go-winio/file.go b/go/vendor/github.com/keybase/go-winio/file.go similarity index 99% rename from go/vendor/github.com/Microsoft/go-winio/file.go rename to go/vendor/github.com/keybase/go-winio/file.go index 4334ff1cbeeb..5ddbf7606b75 100644 --- a/go/vendor/github.com/Microsoft/go-winio/file.go +++ b/go/vendor/github.com/keybase/go-winio/file.go @@ -227,7 +227,7 @@ func (f *win32File) Read(b []byte) (int, error) { // Handle EOF conditions. if err == nil && n == 0 && len(b) != 0 { return 0, io.EOF - } else if err == syscall.ERROR_BROKEN_PIPE { + } else if err == syscall.ERROR_BROKEN_PIPE || err == ErrFileClosed { return 0, io.EOF } else { return n, err diff --git a/go/vendor/github.com/Microsoft/go-winio/fileinfo.go b/go/vendor/github.com/keybase/go-winio/fileinfo.go similarity index 100% rename from go/vendor/github.com/Microsoft/go-winio/fileinfo.go rename to go/vendor/github.com/keybase/go-winio/fileinfo.go diff --git a/go/vendor/github.com/Microsoft/go-winio/pipe.go b/go/vendor/github.com/keybase/go-winio/pipe.go similarity index 100% rename from go/vendor/github.com/Microsoft/go-winio/pipe.go rename to go/vendor/github.com/keybase/go-winio/pipe.go diff --git a/go/vendor/github.com/Microsoft/go-winio/privilege.go b/go/vendor/github.com/keybase/go-winio/privilege.go similarity index 100% rename from go/vendor/github.com/Microsoft/go-winio/privilege.go rename to go/vendor/github.com/keybase/go-winio/privilege.go diff --git a/go/vendor/github.com/Microsoft/go-winio/reparse.go b/go/vendor/github.com/keybase/go-winio/reparse.go similarity index 100% rename from go/vendor/github.com/Microsoft/go-winio/reparse.go rename to go/vendor/github.com/keybase/go-winio/reparse.go diff --git a/go/vendor/github.com/Microsoft/go-winio/sd.go b/go/vendor/github.com/keybase/go-winio/sd.go similarity index 100% rename from go/vendor/github.com/Microsoft/go-winio/sd.go rename to go/vendor/github.com/keybase/go-winio/sd.go diff --git a/go/vendor/github.com/Microsoft/go-winio/syscall.go b/go/vendor/github.com/keybase/go-winio/syscall.go similarity index 100% rename from go/vendor/github.com/Microsoft/go-winio/syscall.go rename to go/vendor/github.com/keybase/go-winio/syscall.go diff --git a/go/vendor/github.com/Microsoft/go-winio/zsyscall_windows.go b/go/vendor/github.com/keybase/go-winio/zsyscall_windows.go similarity index 100% rename from go/vendor/github.com/Microsoft/go-winio/zsyscall_windows.go rename to go/vendor/github.com/keybase/go-winio/zsyscall_windows.go diff --git a/go/vendor/vendor.json b/go/vendor/vendor.json index f159cc2b530e..6a4cb2b4f8c5 100644 --- a/go/vendor/vendor.json +++ b/go/vendor/vendor.json @@ -39,9 +39,10 @@ "revisionTime": "2017-06-26T11:06:00Z" }, { - "path": "github.com/Microsoft/go-winio", - "revision": "97e4973ce50b2ff5f09635a57e2b88a037aae829", - "revisionTime": "2018-08-23T15:24:21-07:00" + "checksumSHA1": "rRRQUZrxRapCpdmV2BUgmJRE/ww=", + "path": "github.com/Keybase/go-winio", + "revision": "b1d96ab97b58dcaf6fd4e4c21cdf73a5bc3a388e", + "revisionTime": "2018-09-13T22:10:37Z" }, { "checksumSHA1": "b2fhCQnbJ+xgt/4eSjmTKcMjGrM=", @@ -383,16 +384,16 @@ "revision": "84ebf93577bf48141063f7842bc137c3d40c4b82", "revisionTime": "2018-08-06T20:08:11Z" }, - { - "path": "github.com/keybase/ps-go", - "revision": "" - }, { "checksumSHA1": "o3BupHtJ9Txi4Cfns9vcvvLrQC8=", "path": "github.com/keybase/pipeliner", "revision": "d5de6f17e362642916083c2fb9c1c8b8606c0bf8", "revisionTime": "2018-08-24T13:24:23Z" }, + { + "path": "github.com/keybase/ps-go", + "revision": "" + }, { "checksumSHA1": "AdTewzl8bd3Il/9CHP/+b4hkhyw=", "path": "github.com/keybase/saltpack", From c7f149faeedc8c52398a20456bfee9fde2f1a7ea Mon Sep 17 00:00:00 2001 From: Steve Sanders Date: Thu, 13 Sep 2018 16:04:14 -0700 Subject: [PATCH 2/2] forgot to change includes --- go/libkb/socket_windows.go | 2 +- go/libkb/testfixtures/kb_pipetest_server/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go/libkb/socket_windows.go b/go/libkb/socket_windows.go index c64cdaf5e95d..1e0b18797df1 100644 --- a/go/libkb/socket_windows.go +++ b/go/libkb/socket_windows.go @@ -12,8 +12,8 @@ import ( "strings" "time" - mspipe "github.com/Microsoft/go-winio" "github.com/keybase/client/go/logger" + mspipe "github.com/keybase/go-winio" ) func NewSocket(g *GlobalContext) (ret Socket, err error) { diff --git a/go/libkb/testfixtures/kb_pipetest_server/main.go b/go/libkb/testfixtures/kb_pipetest_server/main.go index 57e750e38b6a..76fd366e7343 100644 --- a/go/libkb/testfixtures/kb_pipetest_server/main.go +++ b/go/libkb/testfixtures/kb_pipetest_server/main.go @@ -8,7 +8,7 @@ import ( "fmt" "net" - mspipe "github.com/Microsoft/go-winio" + mspipe "github.com/keybase/go-winio" ) // Use Dial to connect to a server and read messages from it.