summaryrefslogtreecommitdiff
path: root/lib/setsockopt.c
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2011-10-22 16:24:32 +0200
committerLudovic Courtès <ludo@gnu.org>2011-10-22 16:24:32 +0200
commit35428fb6b2d269dbfa2eec7d0739aec149bd4cc2 (patch)
tree03146c5871ad9b2167f3dffc89fdbb3082d7fc4e /lib/setsockopt.c
parentfe4ea6859e7d19a0fe2694a3fb49f4abb722afc1 (diff)
downloadguile-35428fb6b2d269dbfa2eec7d0739aec149bd4cc2.tar.gz
Update Gnulib to v0.0-6523-gb3609c1.
Diffstat (limited to 'lib/setsockopt.c')
-rw-r--r--lib/setsockopt.c31
1 files changed, 20 insertions, 11 deletions
diff --git a/lib/setsockopt.c b/lib/setsockopt.c
index 5623ca387..dfd7f34f2 100644
--- a/lib/setsockopt.c
+++ b/lib/setsockopt.c
@@ -34,23 +34,32 @@
int
rpl_setsockopt (int fd, int level, int optname, const void *optval, socklen_t optlen)
{
- int r;
SOCKET sock = FD_TO_SOCKET (fd);
+ int r;
- if (level == SOL_SOCKET && (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO))
+ if (sock == INVALID_SOCKET)
{
- const struct timeval *tv = optval;
- int milliseconds = tv->tv_sec * 1000 + tv->tv_usec / 1000;
- optval = &milliseconds;
- r = setsockopt (sock, level, optname, optval, sizeof (int));
+ errno = EBADF;
+ return -1;
}
else
{
- r = setsockopt (sock, level, optname, optval, optlen);
- }
+ if (level == SOL_SOCKET
+ && (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO))
+ {
+ const struct timeval *tv = optval;
+ int milliseconds = tv->tv_sec * 1000 + tv->tv_usec / 1000;
+ optval = &milliseconds;
+ r = setsockopt (sock, level, optname, optval, sizeof (int));
+ }
+ else
+ {
+ r = setsockopt (sock, level, optname, optval, optlen);
+ }
- if (r < 0)
- set_winsock_errno ();
+ if (r < 0)
+ set_winsock_errno ();
- return r;
+ return r;
+ }
}