Update to current Go library.

From-SVN: r171732

2 files changed, 8 insertions, 3 deletions

diff --git a/libgo/syscalls/socket.go b/libgo/syscalls/socket.go
index e786653..28581a5 100644
--- a/libgo/syscalls/socket.go
+++ b/libgo/syscalls/socket.go
@@ -208,6 +208,13 @@ func Listen(fd int, n int) (errno int) {
   return;
 }
 
+func GetsockoptInt(fd, level, opt int) (value, errno int) {
+	var n int32
+	vallen := Socklen_t(4)
+	errno = libc_getsockopt(fd, level, opt, (*byte)(unsafe.Pointer(&n)), &vallen)
+	return int(n), errno
+}
+
 func setsockopt(fd, level, opt int, valueptr uintptr, length Socklen_t) (errno int) {
   r := libc_setsockopt(fd, level, opt, (*byte)(unsafe.Pointer(valueptr)),
 		       length);
@@ -383,5 +390,3 @@ func Shutdown(fd int, how int) (errno int) {
 	if r < 0 { errno = GetErrno() }
 	return;
 }
-
-// FIXME: No getsockopt.
diff --git a/libgo/syscalls/sysfile_posix.go b/libgo/syscalls/sysfile_posix.go
index 8b72498..46ac0e0 100644
--- a/libgo/syscalls/sysfile_posix.go
+++ b/libgo/syscalls/sysfile_posix.go
@@ -209,7 +209,7 @@ func FDZero(set *FdSet_t) {
 
 func Select(nfds int, r *FdSet_t, w *FdSet_t, e *FdSet_t, timeout *Timeval) (n int, errno int) {
   n = libc_select(nfds, (*byte)(unsafe.Pointer(r)),
-		  (*byte)(unsafe.Pointer(e)),
+		  (*byte)(unsafe.Pointer(w)),
 		  (*byte)(unsafe.Pointer(e)), timeout);
   if n < 0 { errno = GetErrno() }
   return;