moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Fix build under Windows.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2011-04-03 20:23:31 +02:00
parent ca244196f1
commit b1acde223f
5 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -2,6 +2,8 @@
* bootstrap.conf (gnulib_modules): Add `fcntl'. * bootstrap.conf (gnulib_modules): Add `fcntl'.
(gnulib_modules): Add `ioctl'.
2011-03-26 Giuseppe Scrivano <gscrivano@gnu.org> 2011-03-26 Giuseppe Scrivano <gscrivano@gnu.org>
* configure.ac: Fix the gnutls detection. * configure.ac: Fix the gnutls detection.

1
bootstrap.conf
View File

@ -39,6 +39,7 @@ getpass-gnu
getpeername getpeername
getsockname getsockname
gnupload gnupload
ioctl
iconv-h iconv-h
listen listen
maintainer-makefile maintainer-makefile

2
configure.ac
View File

@ -223,7 +223,7 @@ WGET_NSL_SOCKET
dnl Deal with specific hosts dnl Deal with specific hosts
case $host_os in case $host_os in
*mingw32* ) *mingw32* )
AC_SUBST(W32LIBS, '-lws2_32') AC_SUBST(W32LIBS, '-lws2_32 -lgdi32')
AC_LIBOBJ([mswindows]) AC_LIBOBJ([mswindows])
;; ;;
esac esac

7
src/ChangeLog
View File

@ -1,8 +1,13 @@
2011-04-03 Giuseppe Scrivano <gscrivano@gnu.org> 2011-04-03 Giuseppe Scrivano <gscrivano@gnu.org>
* gnutls.c: Include <fcntl.h> * gnutls.c: Include <fcntl.h>.
(wgnutls_peek): Make the socket non blocking before attempt a read. (wgnutls_peek): Make the socket non blocking before attempt a read.
* gnutls.c: Include <sys/ioctl.h>.
(wgnutls_peek) [F_GETFL]: Use fcntl.
(wgnutls_peek) [! F_GETFL]: Use ioctl.
2011-03-31 Giuseppe Scrivano <gscrivano@gnu.org> 2011-03-31 Giuseppe Scrivano <gscrivano@gnu.org>
* recur.c (download_child_p): When --no-parent is used, check that the * recur.c (download_child_p): When --no-parent is used, check that the

17
src/gnutls.c
View File

@ -41,6 +41,7 @@ as that of the covered work. */
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
#include <gnutls/x509.h> #include <gnutls/x509.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h>
#include "utils.h" #include "utils.h"
#include "connect.h" #include "connect.h"
@ -183,6 +184,7 @@ wgnutls_peek (int fd, char *buf, int bufsize, void *arg)
if (bufsize > offset) if (bufsize > offset)
{ {
#ifdef F_GETFL
int flags; int flags;
flags = fcntl (fd, F_GETFL, 0); flags = fcntl (fd, F_GETFL, 0);
if (flags < 0) if (flags < 0)
@ -191,7 +193,13 @@ wgnutls_peek (int fd, char *buf, int bufsize, void *arg)
ret = fcntl (fd, F_SETFL, flags | O_NONBLOCK); ret = fcntl (fd, F_SETFL, flags | O_NONBLOCK);
if (ret < 0) if (ret < 0)
return ret; return ret;
#else
/* XXX: Assume it was blocking before. */
const int zero = 0;
ret = ioctl (fd, FIONBIO, &zero);
if (ret < 0)
return ret;
#endif
do do
{ {
ret = gnutls_record_recv (ctx->session, buf + offset, ret = gnutls_record_recv (ctx->session, buf + offset,
@ -214,9 +222,16 @@ wgnutls_peek (int fd, char *buf, int bufsize, void *arg)
ctx->peeklen += ret; ctx->peeklen += ret;
} }
#ifdef F_GETFL
fcntl (fd, F_SETFL, flags); fcntl (fd, F_SETFL, flags);
if (ret < 0) if (ret < 0)
return ret; return ret;
#else
const int one = 1;
ret = ioctl (fd, FIONBIO, &one);
if (ret < 0)
return ret;
#endif
} }
return offset + ret; return offset + ret;