X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frecv.c;h=c6e2c002be49905bb5146fedbe7c1d2ffc8e2db7;hb=844a4da8483610b921cb017679848ceaf47a7b2e;hp=73e2a11d30f524bec9d784314b03a0ea86fcb698;hpb=b2e2010c7c902235b5efb5bd3c6529f61b093aa4;p=gnulib.git diff --git a/lib/recv.c b/lib/recv.c index 73e2a11d3..c6e2c002b 100644 --- a/lib/recv.c +++ b/lib/recv.c @@ -1,6 +1,6 @@ /* recv.c --- wrappers for Windows recv function - Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2008-2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,13 +28,22 @@ #undef recv -int -rpl_recv (int fd, void *buf, int len, int flags) +ssize_t +rpl_recv (int fd, void *buf, size_t len, int flags) { SOCKET sock = FD_TO_SOCKET (fd); - int r = recv (sock, buf, len, flags); - if (r < 0) - set_winsock_errno (); - return r; + if (sock == INVALID_SOCKET) + { + errno = EBADF; + return -1; + } + else + { + int r = recv (sock, buf, len, flags); + if (r < 0) + set_winsock_errno (); + + return r; + } }