Update Go library to last weekly.

[pf3gnuchains/gcc-fork.git] / libgo / go / net / fd.go

diff --git a/libgo/go/net/fd.go b/libgo/go/net/fd.go
index 707dcca..80d40af 100644 (file)
--- a/libgo/go/net/fd.go
+++ b/libgo/go/net/fd.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build darwin freebsd linux openbsd
+
 package net
 
 import (
@@ -150,7 +152,7 @@ func (s *pollServer) LookupFD(fd int, mode int) *netFD {
        if !ok {
                return nil
        }
-       s.pending[key] = nil, false
+       delete(s.pending, key)
        return netfd
 }
 
@@ -193,7 +195,7 @@ func (s *pollServer) CheckDeadlines() {
                }
                if t > 0 {
                        if t <= now {
-                               s.pending[key] = nil, false
+                               delete(s.pending, key)
                                if mode == 'r' {
                                        s.poll.DelFD(fd.sysfd, mode)
                                        fd.rdeadline = -1
@@ -356,6 +358,25 @@ func (fd *netFD) Close() os.Error {
        return nil
 }
 
+func (fd *netFD) shutdown(how int) os.Error {
+       if fd == nil || fd.sysfile == nil {
+               return os.EINVAL
+       }
+       errno := syscall.Shutdown(fd.sysfd, how)
+       if errno != 0 {
+               return &OpError{"shutdown", fd.net, fd.laddr, os.Errno(errno)}
+       }
+       return nil
+}
+
+func (fd *netFD) CloseRead() os.Error {
+       return fd.shutdown(syscall.SHUT_RD)
+}
+
+func (fd *netFD) CloseWrite() os.Error {
+       return fd.shutdown(syscall.SHUT_WR)
+}
+
 func (fd *netFD) Read(p []byte) (n int, err os.Error) {
        if fd == nil {
                return 0, os.EINVAL