From: Andrey Mirtchovski Date: Mon, 31 Oct 2011 17:34:59 +0000 (-0400) Subject: syscall: fix Await msg on Plan 9 X-Git-Tag: weekly.2011-11-01~21 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d1f48db1cc021924e52614b5f7a71ab8bfa3f1cd;p=gostls13.git syscall: fix Await msg on Plan 9 Plan 9's await() returns '' for nil exit status but programs, most notably gotest, see this as an error return. R=rsc CC=golang-dev https://golang.org/cl/5305079 --- diff --git a/src/pkg/syscall/syscall_plan9.go b/src/pkg/syscall/syscall_plan9.go index eacdd93c9c..16f8e7337e 100644 --- a/src/pkg/syscall/syscall_plan9.go +++ b/src/pkg/syscall/syscall_plan9.go @@ -245,6 +245,10 @@ func Await(w *Waitmsg) (err Error) { w.Time[1] = uint32(atoi(f[2])) w.Time[2] = uint32(atoi(f[3])) w.Msg = cstring(f[4]) + if w.Msg == "''" { + // await() returns '' for no error + w.Msg = "" + } return }