From: Micah Cowan Date: Sat, 8 Dec 2007 01:37:07 +0000 (-0800) Subject: Merge SFLC licensing changes for OpenSSL with tip. X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=462e643a7e31676eceda23e634241f7b4d2cd7bb;hp=-c Merge SFLC licensing changes for OpenSSL with tip. --- 462e643a7e31676eceda23e634241f7b4d2cd7bb diff --combined ChangeLog index 50afcdda,91de4f37..9b452863 --- a/ChangeLog +++ b/ChangeLog @@@ -1,97 -1,13 +1,103 @@@ + 2007-11-28 Micah Cowan + - * Makefile.in, README, autogen.sh, configure.bat, configure.in, - m4/wget.m4, util/Makefile.in, util/dist-wget: Updated license ++ * Makefile.am, README, autogen.sh, configure.bat, configure.in, ++ m4/wget.m4, util/Makefile.am, util/dist-wget: Updated license + exception for OpenSSL, per the SFLC. + +2007-10-23 Micah Cowan + + * lib/stdbool.in.h, lib/stdint.in.h: gnulib-tool --update. + Includes fix for broken stdbool.h on Tru64. + +2007-10-22 Micah Cowan + + * po/*.po: Refresh from TP and update-po. + * lib/Makefile.am, m4/gnulib-cache.m4, m4/longlong.m4, + m4/ulonglong.m4, maint.mk: gnulib-tool --update. Includes fix + for maint.mk with old versions of gzip. + +2007-10-18 Micah Cowan + + * po/POTFILES.in: Removed no-longer-existing or generated files. + * autogen.sh: Reinstated, in case we have to do something at + some point other than autoreconf. + * Makefile.am: Put autogen.sh back in EXTRA_DIST. Just in case + someone needs to rebuild configure. + * configure.ac: Removed config-post.h inclusion from bottom of + generated config.h. + +2007-10-16 Micah Cowan + + * README: Draw attention to wiki:PatchGuidelines. + +2007-10-14 Micah Cowan + + * configure.ac: Let gnulib handle builtin MD5 functionality. + * NEWS: Mention gnulib. + +2007-10-13 Micah Cowan + + * GNUMakefile, maint.mk: Added as part of the gnulib-ization. + * Makefile.am: gnulib-ized. + * configure.ac: gnulib-ized. Removed built-in getopt checks. + +2007-10-12 Micah Cowan + + * PATCHES: Removed. + * NEWS: Updated info about source repositories, removal of + PATCHES file. + +2007-10-09 Micah Cowan + + * configure.in: Renamed to configure.ac + * configure.ac: Renamed from configure.in. Added invocations of + AM_GNU_GETTEXT, etc. Added en@quot and en@boldquot pseudo-LINGUA + support. + * ABOUT-NLS: Added back in (required by autoreconf :\). + * Makefile.am: Added ABOUT-NLS and msdos/Makefile.WC to EXTRA_DIST. + * m4/wget.m4: Removed no-longer-used NLS stuff. + * Makefile.in.in: Restore previous policy of not updating .po's + unless explicitly asked (via update-po). + +2007-10-09 gettextize + + * m4/gettext.m4: New file, from gettext-0.16.1. + * m4/iconv.m4: New file, from gettext-0.16.1. + * m4/lib-ld.m4: Upgrade to gettext-0.16.1. + * m4/lib-link.m4: Upgrade to gettext-0.16.1. + * m4/lib-prefix.m4: Upgrade to gettext-0.16.1. + * m4/nls.m4: New file, from gettext-0.16.1. + * m4/po.m4: New file, from gettext-0.16.1. + * m4/progtest.m4: New file, from gettext-0.16.1. + * po/Makefile.in.in: Upgrade to gettext-0.16.1. + * po/Rules-quot: New file, from gettext-0.16.1. + * po/boldquot.sed: New file, from gettext-0.16.1. + * po/en@boldquot.header: New file, from gettext-0.16.1. + * po/en@quot.header: New file, from gettext-0.16.1. + * po/insert-header.sin: New file, from gettext-0.16.1. + * po/quot.sed: New file, from gettext-0.16.1. + * po/remove-potcdate.sin: New file, from gettext-0.16.1. + +2007-10-08 Micah Cowan + + * AUTHORS: Credit to Ralf Wildenhues for automakifying patches. + +2007-10-05 Ralf Wildenhues + + * po/Makefile.in.in: Since `distdir' is used now, adjust + DISTFILES to the missing ChangeLog file. + Add trivial targets ps, pdf, html. + * Makefile.in: Removed, replaced by Makefile.am. + * Makefile.am: Converted from Makefile.in. + * util/Makefile.in: Removed, replaced by Makefile.am. + * util/Makefile.am: Converted from Makefile.in. + * configure.in: Adjust for automake support. + 2007-10-05 Micah Cowan * config.guess, config.sub, install-sh: Update from versions found in /usr/share/automake/. + * autogen.sh: Removed, in favor of just running autoreconf. 2007-10-03 Micah Cowan @@@ -1403,8 -1319,8 +1409,8 @@@ 2001-03-20 Dan Harkless * TODO: Oops. Hostless absolute link conversion _is_ working. My - test that led me to believe it wasn't was exposing a different bug - -- URLs specified on the commandline as opposed to being recursed + test that led me to believe it wasn't was exposing a different bug + -- URLs specified on the commandline as opposed to being recursed to don't always get re-converted at the end of the Wget run. 2001-03-17 Dan Harkless @@@ -1442,7 -1358,7 +1448,7 @@@ 2001-03-12 Dan Harkless * TODO: Only normal recursion should respect -np -- page-requisite - recursion should not. + recursion should not. 2001-03-07 Jan Prikryl @@@ -1456,10 -1372,10 +1462,10 @@@ 2001-03-01 Dan Harkless * ChangeLog.README: Renamed from README.branches and added a note - that Wget has multiple ChangeLog files (currently ./ChangeLog, - doc/ChangeLog, and src/ChangeLog), since this is unusual and - people have complained their patches hadn't been applied after - checking only the top-level ChangeLog. + that Wget has multiple ChangeLog files (currently ./ChangeLog, + doc/ChangeLog, and src/ChangeLog), since this is unusual and + people have complained their patches hadn't been applied after + checking only the top-level ChangeLog. 2001-02-28 Dan Harkless @@@ -1478,10 -1394,10 +1484,10 @@@ moving -nr to a different category. * TODO: "Timestamps are sometimes not copied over on files - retrieved by FTP." removed. Hopefully all the failures I was - seeing were due to the fact that it wasn't documented that - non-globbing, non-recursive FTP downloads need -N to get the - remote timestamp to be preserved. + retrieved by FTP." removed. Hopefully all the failures I was + seeing were due to the fact that it wasn't documented that + non-globbing, non-recursive FTP downloads need -N to get the + remote timestamp to be preserved. 2001-02-22 Dan Harkless @@@ -1525,7 -1441,7 +1531,7 @@@ 2001-01-11 Dan Harkless * TODO: If -c used with -N, check to make sure a file hasn't - changed on the server before "continuing" to download it. + changed on the server before "continuing" to download it. 2001-01-11 Adrian Aichner @@@ -1542,7 -1458,7 +1548,7 @@@ directory got fixed without the TODO entry for it being removed. * TODO: Add a "rollback" option to have --continue throw away X - corrupted (e.g. by proxy) bytes from end of file before resuming. + corrupted (e.g. by proxy) bytes from end of file before resuming. * po/*.po*: Updated after changing --help's description of -c. @@@ -1556,8 -1472,8 +1562,8 @@@ * README.branches: Explains the 1.6_branch.ChangeLog files. * README.cvs: Falsely claimed you only needed GNU autoconf to - build from the CVS sources. You also need GNU gettext and - texinfo. I also did a bunch of general re-writing of this file. + build from the CVS sources. You also need GNU gettext and + texinfo. I also did a bunch of general re-writing of this file. 2001-01-03 Dan Harkless diff --combined Makefile.am index f7a2c221,00000000..e93a0b4f mode 100644,000000..100644 --- a/Makefile.am +++ b/Makefile.am @@@ -1,45 -1,0 +1,46 @@@ +# Makefile for `Wget' utility +# Copyright (C) 1995, 1996, 1997, 2006 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996, 1997, 2006, 2007 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 +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + - # In addition, as a special exception, the Free Software Foundation - # gives permission to link the code of its release of Wget with the - # OpenSSL project's "OpenSSL" library (or with modified versions of it - # that use the same license as the "OpenSSL" library), and distribute - # the linked executables. You must obey the GNU General Public License - # in all respects for all of the code used other than "OpenSSL". If you - # modify this file, you may extend this exception to your version of the - # file, but you are not obligated to do so. If you do not wish to do - # so, delete this exception statement from your version. ++# Additional permission under GNU GPL version 3 section 7 ++ ++# If you modify this program, or any covered work, by linking or ++# combining it with the OpenSSL project's OpenSSL library (or a ++# modified version of that library), containing parts covered by the ++# terms of the OpenSSL or SSLeay licenses, the Free Software Foundation ++# grants you additional permission to convey the resulting work. ++# Corresponding Source for a non-source form of such a combination ++# shall include the source code for the parts of OpenSSL used as well ++# as that of the covered work. + +# +# Version: @VERSION@ +# + +# Search for macros in the m4 subdirectory: +ACLOCAL_AMFLAGS = -I m4 + +# subdirectories in the distribution +SUBDIRS = lib src doc po tests util windows + +test: all + cd tests && $(MAKE) $(AM_MAKEFLAGS) $@ + +EXTRA_DIST = ChangeLog.README configure.bat MAILING-LIST \ + msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \ + msdos/Makefile.WC ABOUT-NLS autogen.sh + +CLEANFILES = *~ *.bak $(DISTNAME).tar.gz diff --combined README index b062a49e,be692876..2c668489 --- a/README +++ b/README @@@ -52,9 -52,6 +52,9 @@@ Please report bugs in Wget to . +If you would like to contribute code for Wget, please read +http://wget.addictivecode.org/PatchGuidelines. + MAINTAINER: Micah Cowan Wget was originally written and mainained by Hrvoje Niksic. Please see @@@ -80,12 -77,13 +80,13 @@@ along with this program; if not, write Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - In addition, as a special exception, the Free Software Foundation - gives permission to link the code of its release of Wget with the - OpenSSL project's "OpenSSL" library (or with modified versions of it - that use the same license as the "OpenSSL" library), and distribute - the linked executables. You must obey the GNU General Public License - in all respects for all of the code used other than "OpenSSL". If you - modify this file, you may extend this exception to your version of the - file, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. + Additional permission under GNU GPL version 3 section 7 + + If you modify this program, or any covered work, by linking or + combining it with the OpenSSL project's OpenSSL library (or a + modified version of that library), containing parts covered by the + terms of the OpenSSL or SSLeay licenses, the Free Software Foundation + grants you additional permission to convey the resulting work. + Corresponding Source for a non-source form of such a combination + shall include the source code for the parts of OpenSSL used as well + as that of the covered work. diff --combined configure.ac index 4f65b7b1,00000000..9503ff6b mode 100644,000000..100644 --- a/configure.ac +++ b/configure.ac @@@ -1,461 -1,0 +1,462 @@@ +dnl Template file for GNU Autoconf +dnl Copyright (C) 1995, 1996, 1997, 2001, 2007 Free Software Foundation, Inc. + +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 3 of the License, or +dnl (at your option) any later version. + +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. + +dnl You should have received a copy of the GNU General Public License +dnl along with this program. If not, see . + - dnl In addition, as a special exception, the Free Software Foundation - dnl gives permission to link the code of its release of Wget with the - dnl OpenSSL project's "OpenSSL" library (or with modified versions of it - dnl that use the same license as the "OpenSSL" library), and distribute - dnl the linked executables. You must obey the GNU General Public License - dnl in all respects for all of the code used other than "OpenSSL". If you - dnl modify this file, you may extend this exception to your version of the - dnl file, but you are not obligated to do so. If you do not wish to do - dnl so, delete this exception statement from your version. ++dnl Additional permission under GNU GPL version 3 section 7 ++ ++dnl If you modify this program, or any covered work, by linking or ++dnl combining it with the OpenSSL project's OpenSSL library (or a ++dnl modified version of that library), containing parts covered by the ++dnl terms of the OpenSSL or SSLeay licenses, the Free Software Foundation ++dnl grants you additional permission to convey the resulting work. ++dnl Corresponding Source for a non-source form of such a combination ++dnl shall include the source code for the parts of OpenSSL used as well ++dnl as that of the covered work. + +dnl +dnl Process this file with autoconf to produce a configure script. +dnl + +AC_INIT([wget], + [1.12-devel], + [bug-wget@gnu.org]) +AC_PREREQ(2.61) + +dnl +dnl What version of Wget are we building? +dnl +AC_MSG_NOTICE([configuring for GNU Wget $PACKAGE_VERSION]) + +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_AUX_DIR([.]) + +dnl +dnl Automake setup +dnl +AM_INIT_AUTOMAKE(1.9) + +dnl +dnl Gettext +dnl +AM_GNU_GETTEXT([external],[need-ngettext]) +AM_GNU_GETTEXT_VERSION([0.16.1]) + +dnl +dnl Get cannonical host +dnl +AC_CANONICAL_HOST +AC_DEFINE_UNQUOTED([OS_TYPE], "$host_os", + [Define to be the name of the operating system.]) + +dnl +dnl Process features. +dnl + +AC_ARG_WITH(ssl, +[[ --without-ssl disable SSL autodetection]]) + +AC_ARG_ENABLE(opie, +[ --disable-opie disable support for opie or s/key FTP login], +ENABLE_OPIE=$enableval, ENABLE_OPIE=yes) +test x"${ENABLE_OPIE}" = xyes && AC_DEFINE([ENABLE_OPIE], 1, + [Define if you want the Opie support for FTP compiled in.]) + +AC_ARG_ENABLE(digest, +[ --disable-digest disable support for HTTP digest authorization], +ENABLE_DIGEST=$enableval, ENABLE_DIGEST=yes) +test x"${ENABLE_DIGEST}" = xyes && AC_DEFINE([ENABLE_DIGEST], 1, + [Define if you want the HTTP Digest Authorization compiled in.]) + +AC_ARG_ENABLE(ntlm, +[ --disable-ntlm disable support for NTLM authorization], +[ENABLE_NTLM=$enableval], [ENABLE_NTLM=auto]) + +AC_ARG_ENABLE(debug, +[ --disable-debug disable support for debugging output], +ENABLE_DEBUG=$enableval, ENABLE_DEBUG=yes) +test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE([ENABLE_DEBUG], 1, + [Define if you want the debug output support compiled in.]) + +wget_need_md5=no + +case "${ENABLE_OPIE}${ENABLE_DIGEST}" in +*yes*) + wget_need_md5=yes +esac + +dnl +dnl Find the compiler +dnl + +dnl We want these before the checks, so the checks can modify their values. +test -z "$CFLAGS" && CFLAGS= auto_cflags=1 +test -z "$CC" && cc_specified=yes + +AC_PROG_CC +AM_PROG_CC_C_O +AC_AIX +gl_EARLY + +AC_PROG_RANLIB + +dnl Turn on optimization by default. Specifically: +dnl +dnl if the user hasn't specified CFLAGS, then +dnl if compiler is gcc, then +dnl use -O2 and some warning flags +dnl else +dnl use os-specific flags or -O +if test -n "$auto_cflags"; then + if test -n "$GCC"; then + CFLAGS="$CFLAGS -O2 -Wall" + else + case "$host_os" in + *hpux*) CFLAGS="$CFLAGS +O3" ;; + *ultrix* | *osf*) CFLAGS="$CFLAGS -O -Olimit 2000" ;; + *) CFLAGS="$CFLAGS -O" ;; + esac + fi +fi + +dnl +dnl Checks for basic compiler characteristics. +dnl +AC_C_CONST +AC_C_INLINE +AC_C_VOLATILE + +dnl Check for basic headers, even though we expect them to exist and +dnl #include them unconditionally in the code. Their detection is +dnl still needed because test programs used by Autoconf macros check +dnl for STDC_HEADERS, HAVE_SYS_TYPES_H, etc. before using them. +dnl Without the checks they will fail to be included in test programs, +dnl which will subsequently fail. +AC_HEADER_STDC + +dnl Check for large file support. This check needs to come fairly +dnl early because it could (in principle) affect whether functions and +dnl headers are available, whether they work, etc. +AC_SYS_LARGEFILE +AC_CHECK_SIZEOF(off_t) + +dnl +dnl Checks for system header files that might be missing. +dnl +AC_HEADER_STDBOOL +AC_CHECK_HEADERS(unistd.h sys/time.h) +AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h) +AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h) + +dnl +dnl Check sizes of integer types. These are used to find n-bit +dnl integral types on older systems that fail to provide intN_t and +dnl uintN_t typedefs. +dnl +AC_CHECK_SIZEOF(short) +AC_CHECK_SIZEOF(int) +AC_CHECK_SIZEOF(long) +AC_CHECK_SIZEOF(long long) +AC_CHECK_SIZEOF(void *) + +dnl +dnl Checks for non-universal or system-specific types. +dnl +AC_TYPE_SIZE_T +AC_TYPE_PID_T +AC_CHECK_TYPES([uint32_t, uintptr_t, intptr_t, int64_t]) +AC_CHECK_TYPES(sig_atomic_t, [], [], [ +#include +#include +#if HAVE_INTTYPES_H +# include +#endif +#include +]) + +# gnulib +gl_INIT + +dnl +dnl Checks for library functions. +dnl +AC_FUNC_ALLOCA +AC_FUNC_MMAP +AC_FUNC_FSEEKO +AC_CHECK_FUNCS(strptime timegm snprintf vsnprintf vasprintf drand48) +AC_CHECK_FUNCS(strtoll usleep ftello sigblock sigsetjmp memrchr) + +if test x"$ENABLE_OPIE" = xyes; then + AC_LIBOBJ([ftp-opie]) +fi + +dnl We expect to have these functions on Unix-like systems configure +dnl runs on. The defines are provided to get them in config.h.in so +dnl Wget can still be ported to non-Unix systems (such as Windows) +dnl that lack some of these functions. +AC_DEFINE([HAVE_STRCASECMP], 1, [Define to 1 if you have the `strcasecmp' function.]) +AC_DEFINE([HAVE_STRNCASECMP], 1, [Define to 1 if you have the `strncasecmp' function.]) +AC_DEFINE([HAVE_STRDUP], 1, [Define to 1 if you have the `strdup' function.]) +AC_DEFINE([HAVE_ISATTY], 1, [Define to 1 if you have the `isatty' function.]) +AC_DEFINE([HAVE_SYMLINK], 1, [Define to 1 if you have the `symlink' function.]) + +dnl +dnl Call Wget-specific macros defined in aclocal. +dnl +WGET_STRUCT_UTIMBUF +WGET_SOCKLEN_T +WGET_FNMATCH +WGET_NANOSLEEP +WGET_POSIX_CLOCK +WGET_NSL_SOCKET + +dnl +dnl Checks for libraries. +dnl + +AS_IF([test x"$with_ssl" = xgnutls], [ + dnl Now actually check for -lssl + AC_LIB_HAVE_LINKFLAGS([gnutls], [], [ +#include + ], [gnutls_global_init()]) + if test x"$LIBGNUTLS" != x + then + AC_MSG_NOTICE([compiling in support for SSL via GnuTLS]) + AC_LIBOBJ([gnutls]) + else + AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.]) + fi +], [ + # --with-ssl is not gnutls: check if it's no + AS_IF([test x"$with_ssl" != xno], [ + dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library + dnl doesn't record its dependency on libdl, so we need to make sure + dnl -ldl ends up in LIBS on systems that have it. Most OSes use + dnl dlopen(), but HP-UX uses shl_load(). + AC_CHECK_LIB(dl, dlopen, [], [ + AC_CHECK_LIB(dl, shl_load) + ]) + + dnl Now actually check for -lssl + AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [ + #include + #include + #include + #include + #include + #include + #include + ], [SSL_library_init ()]) + if test x"$LIBSSL" != x + then + AC_MSG_NOTICE([compiling in support for SSL via OpenSSL]) + AC_LIBOBJ([openssl]) + elif test x"$with_ssl" != x + then + AC_MSG_ERROR([--with-ssl was given, but SSL is not available.]) + fi + ]) # endif: --with-ssl == no? +]) # endif: --with-ssl == gnutls? + + +dnl Enable NTLM if requested and if SSL is available. +if test x"$LIBSSL" != x +then + if test x"$ENABLE_NTLM" != xno + then + AC_DEFINE([ENABLE_NTLM], 1, + [Define if you want the NTLM authorization support compiled in.]) + AC_LIBOBJ([http-ntlm]) + fi +else + dnl If SSL is unavailable and the user explicitly requested NTLM, + dnl abort. + if test x"$ENABLE_NTLM" = xyes + then + AC_MSG_ERROR([NTLM authorization requested and OpenSSL not found; aborting]) + fi +fi + +dnl +dnl Find an MD5 implementation. Since Wget rarely needs MD5, we try +dnl to use an existing library implementation to save on code size. +dnl + +if test x"$wget_need_md5" = xyes +then + dnl This should be moved to an AC_DEFUN, but I'm not sure how to + dnl manipulate MD5_OBJ from the defun. + + AC_LIBOBJ([gen-md5]) + found_md5=no + + dnl Check for the system MD5 library on Solaris. We don't check for + dnl something simple like "MD5Update" because there are a number of + dnl MD5 implementations that use that name, but have an otherwise + dnl incompatible interface. md5_calc is, hopefully, specific to the + dnl Solaris MD5 library. + if test x"$found_md5" = xno; then + AC_CHECK_LIB(md5, md5_calc, [ + dnl Some installations have bogus in the compiler's + dnl include path, making the system md5 library useless. + AC_MSG_CHECKING([for working md5.h]) + AC_COMPILE_IFELSE([#include + ], [ + AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_SOLARIS_MD5], 1, [Define when using Solaris MD5.]) + LIBS="-lmd5 $LIBS" + found_md5=yes + AC_MSG_NOTICE([using the Solaris MD5 implementation]) + ], [AC_MSG_RESULT(no)]) + ]) + fi + + dnl Then see if we're linking OpenSSL anyway; if yes, use its md5 + dnl implementation. + if test x"$found_md5" = xno; then + if test x"$LIBSSL" != x; then + AC_DEFINE([HAVE_OPENSSL_MD5], 1, [Define when using OpenSSL MD5.]) + found_md5=yes + AC_MSG_NOTICE([using the OpenSSL MD5 implementation]) + fi + fi + + dnl If none of the above worked, use the one we ship with Wget. + if test x"$found_md5" = xno; then + AC_DEFINE([HAVE_BUILTIN_MD5], 1, [Define when using built-in MD5.]) + found_md5=yes + AC_MSG_NOTICE([using the built-in (GNU) MD5 implementation]) + AC_C_BIGENDIAN + fi +fi +AC_DEFINE([HAVE_MD5], 1, [Define if we're compiling support for MD5.]) + +dnl ********************************************************************** +dnl Checks for IPv6 +dnl ********************************************************************** + +dnl +dnl We test for IPv6 by checking, in turn, for availability of +dnl getaddrinfo, presence of the INET6 address/protocol family, and +dnl the existence of struct sockaddr_in6. If any of them is missing, +dnl IPv6 is disabled, and the code reverts to old-style gethostbyname. +dnl +dnl If --enable-ipv6 is explicitly specified on the configure command +dnl line, we check for IPv6 and abort if not found. If --disable-ipv6 +dnl is specified, we disable IPv6 and don't check for it. The default +dnl is to autodetect IPv6 and use it where available. +dnl + +AC_ARG_ENABLE(ipv6, + AC_HELP_STRING([--disable-ipv6],[disable IPv6 support]), + [case "${enable_ipv6}" in + no) + AC_MSG_NOTICE([disabling IPv6 at user request]) + dnl Disable IPv6 checking + ipv6=no + ;; + yes) + dnl IPv6 explicitly enabled: force its use (abort if unavailable). + ipv6=yes + force_ipv6=yes + ;; + auto) + dnl Auto-detect IPv6, i.e. check for IPv6, but don't force it. + ipv6=yes + ;; + *) + AC_MSG_ERROR([Invalid --enable-ipv6 argument \`$enable_ipv6']) + ;; + esac + ], [ + dnl If nothing is specified, assume auto-detection. + ipv6=yes + ] +) + +if test "X$ipv6" = "Xyes"; then + AC_CHECK_FUNCS(getaddrinfo, [], [ + AC_MSG_NOTICE([Disabling IPv6 support: your system does not support getaddrinfo(3)]) + ipv6=no + ]) +fi + +if test "X$ipv6" = "Xyes"; then + PROTO_INET6([], [ + AC_MSG_NOTICE([Disabling IPv6 support: your system does not support the PF_INET6 protocol family]) + ipv6=no + ]) +fi + +if test "X$ipv6" = "Xyes"; then + TYPE_STRUCT_SOCKADDR_IN6([],[ + AC_MSG_NOTICE([Disabling IPv6 support: your system does not support \`struct sockaddr_in6']) + ipv6=no + ]) + if test "X$ipv6" = "Xyes"; then + WGET_STRUCT_SOCKADDR_STORAGE + MEMBER_SIN6_SCOPE_ID + fi +fi + +if test "X$ipv6" = "Xyes"; then + AC_DEFINE([ENABLE_IPV6], 1, [Define if IPv6 support is enabled.]) + AC_MSG_NOTICE([Enabling support for IPv6.]) +elif test "x$force_ipv6" = "xyes"; then + AC_MSG_ERROR([IPv6 support requested but not found; aborting]) +fi + + +dnl +dnl Set of available languages. +dnl +dnl Originally this used to be static, looking like this: +dnl ALL_LINGUAS="cs de hr it ..." +dnl The downside was that configure needed to be rebuilt whenever a +dnl new language was added. +dnl +ALL_LINGUAS="en@quot en@boldquot $(cd ${srcdir}/po && ls *.po | grep -v 'en@.*quot' | sed -e 's/\.po$//' | tr '\012' ' ')" + +dnl +dnl Find makeinfo. We used to provide support for Emacs processing +dnl Texinfo using `emacs -batch -eval ...' where makeinfo is +dnl unavailable, but that broke with the addition of makeinfo-specific +dnl command-line options, such as `-I'. Now we depend on makeinfo to +dnl build the Info documentation. +dnl + +AC_CHECK_PROGS(MAKEINFO, [makeinfo], [true]) + +dnl +dnl Find perl and pod2man +dnl + +AC_PATH_PROGS(PERL, [perl5 perl], no) +AC_PATH_PROG(POD2MAN, pod2man, no) + +if test "x${POD2MAN}" = xno; then + COMMENT_IF_NO_POD2MAN="# " +else + COMMENT_IF_NO_POD2MAN= +fi +AC_SUBST(COMMENT_IF_NO_POD2MAN) + +dnl +dnl Create output +dnl +AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile util/Makefile + po/Makefile.in tests/Makefile tests/WgetTest.pm + lib/Makefile windows/Makefile]) +AC_CONFIG_HEADERS([src/config.h]) +AC_OUTPUT diff --combined m4/wget.m4 index 67cc2942,ba06de93..c08cec97 --- a/m4/wget.m4 +++ b/m4/wget.m4 @@@ -15,15 -15,16 +15,16 @@@ dnl GNU General Public License for mor dnl You should have received a copy of the GNU General Public License dnl along with this program. If not, see . - dnl In addition, as a special exception, the Free Software Foundation - dnl gives permission to link the code of its release of Wget with the - dnl OpenSSL project's "OpenSSL" library (or with modified versions of it - dnl that use the same license as the "OpenSSL" library), and distribute - dnl the linked executables. You must obey the GNU General Public License - dnl in all respects for all of the code used other than "OpenSSL". If you - dnl modify this file, you may extend this exception to your version of the - dnl file, but you are not obligated to do so. If you do not wish to do - dnl so, delete this exception statement from your version. + dnl Additional permission under GNU GPL version 3 section 7 + + dnl If you modify this program, or any covered work, by linking or + dnl combining it with the OpenSSL project's OpenSSL library (or a + dnl modified version of that library), containing parts covered by the + dnl terms of the OpenSSL or SSLeay licenses, the Free Software Foundation + dnl grants you additional permission to convey the resulting work. + dnl Corresponding Source for a non-source form of such a combination + dnl shall include the source code for the parts of OpenSSL used as well + dnl as that of the covered work. dnl dnl Check for `struct utimbuf'. @@@ -226,6 -227,145 +227,6 @@@ dnl *********************************** dnl END OF IPv6 AUTOCONFIGURATION SUPPORT MACROS dnl ************************************************************ -# This code originates from Ulrich Drepper's AM_WITH_NLS. - -AC_DEFUN([WGET_WITH_NLS], - [AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - HAVE_NLS=$enableval, HAVE_NLS=yes) - AC_MSG_RESULT($HAVE_NLS) - - dnl If something goes wrong, we may still decide not to use NLS. - dnl For this reason, defer AC_SUBST'ing HAVE_NLS until the very - dnl last moment. - - if test x"$HAVE_NLS" = xyes; then - dnl If LINGUAS is specified, use only those languages. In fact, - dnl compute an intersection of languages in LINGUAS and - dnl ALL_LINGUAS, and use that. - if test x"$LINGUAS" != x; then - new_linguas= - for lang1 in $ALL_LINGUAS; do - for lang2 in $LINGUAS; do - if test "$lang1" = "$lang2"; then - new_linguas="$new_linguas $lang1" - fi - done - done - ALL_LINGUAS=$new_linguas - fi - AC_MSG_NOTICE([language catalogs: $ALL_LINGUAS]) - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_SUBST(MSGFMT) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - CATOBJEXT=.gmo - INSTOBJEXT=.mo - DATADIRNAME=share - - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext programs is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - - AC_CHECK_HEADERS(libintl.h) - - dnl Prefer gettext found in -lintl to the one in libc. - dnl Otherwise it can happen that we include libintl.h from - dnl /usr/local/lib, but fail to specify -lintl, which results in - dnl link or run-time failures. (Symptom: libintl_bindtextdomain - dnl not found at link-time.) - - AC_CHECK_LIB(intl, gettext, [ - dnl gettext is in libintl; announce the fact manually. - LIBS="-lintl $LIBS" - AC_DEFINE([HAVE_GETTEXT], 1, - [Define if you have the gettext function.]) - ], [ - AC_CHECK_FUNCS(gettext, [], [ - AC_MSG_RESULT([gettext not found; disabling NLS]) - HAVE_NLS=no - ]) - ]) - - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - dnl Construct list of names of catalog files to be constructed. - for lang in $ALL_LINGUAS; do - CATALOGS="$CATALOGS ${lang}${CATOBJEXT}" - done - - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(POFILES) - fi - AC_SUBST(HAVE_NLS) - dnl Some independently maintained files, such as po/Makefile.in, - dnl use `USE_NLS', so support it. - USE_NLS=$HAVE_NLS - AC_SUBST(USE_NLS) - if test "x$HAVE_NLS" = xyes; then - AC_DEFINE([HAVE_NLS], 1, [Define this if you want the NLS support.]) - fi - ]) - -dnl Generate list of files to be processed by xgettext which will -dnl be included in po/Makefile. -dnl -dnl This is not strictly an Autoconf macro, because it is run from -dnl within `config.status' rather than from within configure. This -dnl is why special rules must be applied for it. -AC_DEFUN([WGET_PROCESS_PO], - [ - dnl I wonder what the following several lines do... - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - dnl Use `echo' rather than AC_MSG_RESULT, because this is run from - dnl `config.status'. - echo "generating po/POTFILES from $srcdir/po/POTFILES.in" - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," \ - -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - echo "creating po/Makefile" - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - ]) - -# Search path for a program which passes the given test. -# Ulrich Drepper , 1996. -# -# This file may be copied and used freely without restrictions. It -# can be used in projects which are not available under the GNU Public -# License but which still want to provide support for the GNU gettext -# functionality. Please note that the actual code is *not* freely -# available. - dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) AC_DEFUN([AM_PATH_PROG_WITH_TEST], diff --combined msdos/ChangeLog index 1036c296,63881d06..552dec07 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@@ -1,24 -1,7 +1,28 @@@ + 2007-11-28 Micah Cowan + + * config.h: Updated license exception for OpenSSL, per the SFLC. + +2007-10-15 Gisle Vanem + + * config.h: Added some HAVE_* for djgpp 2.04 and Watcom 1.7+. + + * Makefile.DJ: rewritten for including some files from ../lib. + + * Makefile.WC: Ditto. Handling source-files out-of current + directory makes compliation a bit more painfull. AFAICS, one + must use explicit rules. + +2007-10-02 Gisle Vanem + + * config.h: Removed unused defines, added needed 'HAVE_*' defines. + + * Makefile.DJ: rewritten to be used from './src' directory. + Added '-DOPENSSL_NO_KRB5' for OpenSSL build. Target is + now wget.exe. + + * Makefile.WC: Added for building with OpenWatcom targeting + 32-bit DOS (DOS32A extender). + 2007-09-24 Gisle Vanem * Makefile.DJ, config.h: Added to support building on MS-DOS via diff --combined msdos/config.h index f40eb45c,a3e9c1c6..25a6df83 --- a/msdos/config.h +++ b/msdos/config.h @@@ -16,15 -16,16 +16,16 @@@ You should have received a copy of the GNU General Public License along with Wget. If not, see . - In addition, as a special exception, the Free Software Foundation - gives permission to link the code of its release of Wget with the - OpenSSL project's "OpenSSL" library (or with modified versions of it - that use the same license as the "OpenSSL" library), and distribute - the linked executables. You must obey the GNU General Public License - in all respects for all of the code used other than "OpenSSL". If you - modify this file, you may extend this exception to your version of the - file, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. */ + Additional permission under GNU GPL version 3 section 7 + + If you modify this program, or any covered work, by linking or + combining it with the OpenSSL project's OpenSSL library (or a + modified version of that library), containing parts covered by the + terms of the OpenSSL or SSLeay licenses, the Free Software Foundation + grants you additional permission to convey the resulting work. + Corresponding Source for a non-source form of such a combination + shall include the source code for the parts of OpenSSL used as well + as that of the covered work. */ #ifndef CONFIG_DOS_H @@@ -41,43 -42,47 +42,43 @@@ #include -#if defined(__WATCOMC__) && (__WATCOMC__ >= 1250) /* OW 1.5+ */ +#if defined(__WATCOMC__) + #if (__WATCOMC__ >= 1250) /* OW 1.5+ */ #define OPENWATCOM_15 + #endif + #if (__WATCOMC__ >= 1270) /* OW 1.7+ */ + #define OPENWATCOM_17 + #endif #endif #if defined(__HIGHC__) - #define inline #define HAVE_UNISTD_H 1 #define HAVE_UTIME_H 1 #endif -#if defined(__WATCOMC__) || defined(__BORLANDC__) +#if defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__HIGHC__) #define inline #endif -#ifdef HAVE_SSL - #define OPENSSL_NO_KRB5 -#endif - -#define STDC_HEADERS 1 -#define RETSIGTYPE void - #define USE_OPIE 1 #define USE_DIGEST 1 #define DEBUG #ifdef __DJGPP__ - #define HAVE_STRUCT_UTIMBUF 1 - #define HAVE_UNAME 1 - #define HAVE_UTIME_H 1 + #define HAVE__BOOL 1 #define HAVE_STRCASECMP 1 #define HAVE_STRNCASECMP 1 - #define HAVE_SYS_SELECT_H 1 - #define HAVE_USLEEP 1 - #define HAVE_SIGNAL 1 - #define HAVE_BASENAME 1 #define HAVE_SIGSETJMP 1 #define HAVE_SIGBLOCK 1 - #define HAVE__BOOL 1 + #define HAVE_STRUCT_UTIMBUF 1 + #define HAVE_SYS_SELECT_H 1 + #define HAVE_USLEEP 1 + #define HAVE_UTIME_H 1 + #define HAVE_INT64_T 1 #if (DJGPP_MINOR >= 4) - #include + #define HAVE_STDBOOL_H 1 + #define HAVE_STDINT_H 1 #define HAVE_SNPRINTF 1 #define HAVE_VSNPRINTF 1 #define HAVE_UINT32_T 1 @@@ -90,25 -95,32 +91,25 @@@ #endif #ifdef OPENWATCOM_15 - #define HAVE_STRCASECMP - #define HAVE_STRNCASECMP + #define HAVE_INT64_T 1 + #define HAVE_SNPRINTF 1 + #define HAVE_STRCASECMP 1 + #define HAVE_STRNCASECMP 1 + #define HAVE_STDINT_H 1 + #define HAVE_UTIME_H 1 +#endif + +#ifdef OPENWATCOM_17 + #define HAVE__BOOL 1 + #define HAVE_STDBOOL_H 1 #endif -#define HAVE_GETHOSTBYNAME 1 -#define HAVE_GETHOSTNAME 1 -#define HAVE_SELECT 1 +#define HAVE_PROCESS_H 1 #define HAVE_STRDUP 1 -#define HAVE_STRERROR 1 -#define HAVE_STRSTR 1 -#define HAVE_MKTIME 1 -#define HAVE_STDARG_H 1 #define HAVE_STDLIB_H 1 #define HAVE_STRING_H 1 -#define HAVE_SIGNAL_H 1 -#define HAVE_GETTIMEOFDAY 1 -#define HAVE_MD5 1 #define HAVE_BUILTIN_MD5 1 #define HAVE_ISATTY 1 -#define HAVE_MEMMOVE 1 - -#define OS_TYPE "DOS" -#define CTRLBREAK_BACKGND 1 -#define PROTOTYPES 1 - -#define WGET_USE_STDARG #define lookup_host wget_lookuphost #define select select_s @@@ -118,16 -130,15 +119,16 @@@ #define sock_write wget_sock_write #define sock_close wget_sock_close -#if defined(__DJGPP__) - #define MKDIR(p,a) mkdir(p,a) -#else +#if !defined(__DJGPP__) + #include + #define mkdir(p,a) (mkdir)(p) #define strcasecmp stricmp - #define MKDIR(p,a) mkdir(p) #endif #if !defined(MSDOS) -#define MSDOS + #define MSDOS #endif +#define OS_TYPE "DOS" + #endif /* CONFIG_DOS_H */ diff --combined src/ChangeLog index 826a02b4,bb62713a..1c02c9ce --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,110 -1,23 +1,125 @@@ + 2007-11-28 Micah Cowan + - * Makefile.in, cmpt.c, connect.c, connect.h, convert.c, ++ * Makefile.am, cmpt.c, connect.c, connect.h, convert.c, + convert.h, cookies.c, cookies.h, ftp-basic.c, ftp-ls.c, + ftp-opie.c, ftp.c, ftp.h, gen-md5.c, gen-md5.h, gnutls.c, + hash.c, hash.h, host.c, host.h, html-parse.c, html-parse.h, + html-url.c, http-ntlm.c, http-ntlm.h, http.c, http.h, init.c, + init.h, log.c, log.h, main.c, mswindows.c, mswindows.h, + netrc.c, netrc.h, openssl.c, options.h, progress.c, progress.h, + ptimer.c, ptimer.h, recur.c, recur.h, res.c, res.h, retr.c, + retr.h, safe-ctype.c, safe-ctype.h, spider.c, spider.h, ssl.h, + sysdep.h, test.c, test.h, url.c, url.h, utils.c, utils.h, + wget.h, xmalloc.c, xmalloc.h: Updated license exception for + OpenSSL, per the SFLC. + +2007-10-30 Micah Cowan + + * main.c (main): Declare argv parameter as char **argv, rather + than char *const *argv. This fixes usage of getopt_long, + regardless of whether getopt_long has a constified argv or not. + +2007-10-22 Gisle Vanem + + * mswindows.c: Move INHIBIT_WRAP macro definition up with wget.h + inclusion. + +2007-10-18 Steven Schweda + + * sysdep.h: #include as well as , to work + around a glitch on Tru64 systems. + +2007-10-18 Micah Cowan + + * Makefile.am: version.c should not be distributed. Removed + config-post.h. Add version.c dependency and gnulib include path + for libunittest.a. + * sysdep.h: Got contents of config-post.h + * config-post.h: Removed. + * wget.h: #include "config.h". + * alloca.c, cmpt.c, connect.c, convert.c, cookies.c, + ftp-basic.c, ftp-ls.c, ftp-opie.c, ftp.c, gen-md5.c, gnutls.c, + hash.c, host.c, html-parse.c, html-url.c, http-ntlm.c, http.c, + init.c, log.c, main.c, mswindows.c, netrc.c, openssl.c, + progress.c, ptimer.c, recur.c, res.c, retr.c, spider.c, url.c, + utils.c, xmalloc.c: Use wget.h at very top, and instead of + config.h. + +2007-10-15 Micah Cowan + + * Makefile.am: Remove intermediary hg-id file generation, make + version.c-generation more portable. + +2007-10-14 Micah Cowan + + * cmpt.c, cookies.c, ftp-basic.c, ftp-ls.c, ftp.c, hash.c, + host.c, html-parse.c, html-url.c, http-ntlm.c, http.c, init.c, + log.c, main.c, netrc.c, openssl.c, res.c, url.c, utils.c, + wget.h: Replace uses of ISSPACE, etc with c_isspace, etc. + * gnu-md5.c, gnu-md5.h: Removed, in deference to gnulib. + * Makefile.am: Removed gnu-md5.h from wget_SOURCES. + * gen-md5.c: Changed #inclusion of gnu-md5.h to md5.h (gnulib's). + * recur.c (download_child_p): Print error if unlink of + robots.txt fails. + * main.c (main): --spider or --delete-after now implies + --no-directories (thanks, Josh Williams). + +2007-10-14 Joshua David Williams + + * recur.c (download_child_p): Remove robots.txt if + --delete-after or --spider is on. + +2007-10-13 Micah Cowan + + * Makefile.am: Make version.c depend on Wget dependencies (source + files, plus such things as LIBOBJS so we get things like + http-ntlm.c). Removed getopt.[ch], as we're now using gnulib for + these. + +2007-10-10 Micah Cowan + + * http-ntlm.c: Include openssl/opensslv.h explicitly, instead of + hoping it'll be included by accident in openssl/des.h. + +2007-10-09 Gisle Vanem + + * mswindows.c: 'argc' and 'argv' in 'windows_main()' are no longer + needed. Hence simply the prototype. Free 'exec_name' at exit. + +2007-10-09 Micah Cowan + + * gettext.h: Imported from /usr/share/gettext, fuller handling + of --disable-nls. + * wget.h: Remove logic for handling lack of NLS (now in + gettext.h). + * main.c: Use gettext's ENABLE_NLS rather than HAVE_NLS. + * Makefile.am: added @LIBINTL@ to LIBS (though it probably + belongs in LDADD, along with everything else currently assigned + to LIBS). + +2007-10-08 Micah Cowan + + * http.c (http_loop): Add send_head_first conditional back + around code that needs it, but not around the last-modified + header-parsing stuff this time. Removed no-longer-useful (was it + ever?) restart_loop boolean, continuing unconditionally at end + of send_head_first conditional block (if we haven't jumped out). + 2007-10-04 Micah Cowan * http.c (http_loop): We've got_name if content_disposition support isn't on; make sure we continue properly in that case, even though we're not sending HEAD. + * Makefile.in: Removed, replaced by Makefile.am. + * Makefile.am: Converted from Makefile.in. + +2007-10-02 Gisle Vanem + + * ftp.c: Use "_listing" for MSDOS (".listing" is illegal). + + * url.c: Update comment for 'filechr_not_windows'. + + * utils.c: Include for 'getpid()' on Watcom. 2007-10-02 Micah Cowan @@@ -3906,8 -3819,8 +3921,8 @@@ before statements. 2003-10-02 Gisle Vanem - - * mswindows.c (run_with_timeout): For Windows: Run the 'fun' in a + + * mswindows.c (run_with_timeout): For Windows: Run the 'fun' in a thread via a helper function. Continually query the thread's exit-code until finished or timed out. @@@ -6621,7 -6534,7 +6636,7 @@@ 2001-02-23 Dan Harkless * main.c (print_help): --help documentation for -N said it would - re-download files if they had the _same_ timestamp on server. + re-download files if they had the _same_ timestamp on server. (print_help): -nr belongs in "FTP options" section of --help output, not "Recursive retrieval" section. Alphabetized FTP options by long option name. @@@ -6629,8 -6542,8 +6644,8 @@@ 2001-02-16 Dan Harkless * init.c (commands): Hack Kampbjørn discovered - that "httpsproxy" had been inserted into commands[] out of - alphabetical order, causing "BUG: unknown command `httpuser'". + that "httpsproxy" had been inserted into commands[] out of + alphabetical order, causing "BUG: unknown command `httpuser'". 2001-02-13 Jan Prikryl @@@ -6714,19 -6627,19 +6729,19 @@@ 2001-02-08 Christian Fraenkel - * gen_sslfunc.c: verify_callback is now static + * gen_sslfunc.c: verify_callback is now static - * gen_sslfunc.c (init_ssl): load certificate if specified + * gen_sslfunc.c (init_ssl): load certificate if specified - * gen_sslfunc.c (ssl_printerr): new function + * gen_sslfunc.c (ssl_printerr): new function - * init.c: added new --sslcertfile and --sslcertkey switches + * init.c: added new --sslcertfile and --sslcertkey switches - * main.c: ditto + * main.c: ditto - * options.h: ditto + * options.h: ditto - * http.c (gethttp): abort when init_ssl fails + * http.c (gethttp): abort when init_ssl fails 2001-01-23 Herold Heiko @@@ -6747,8 -6660,8 +6762,8 @@@ 2001-01-09 Dan Harkless * html-url.c: A bunch of fixup of `--page-requisites'-related - comments to reflect Hrvoje's changes to my code when transplanting - it into this new file, to fix spelling mistakes, to clarify, etc. + comments to reflect Hrvoje's changes to my code when transplanting + it into this new file, to fix spelling mistakes, to clarify, etc. * url.c (write_backup_file): Clarified a comment. (str_url): Henrik van Ginhoven pointed out on the list that we @@@ -6756,12 -6669,12 +6771,12 @@@ replacing each character with a 'x'. Use "" instead. * ftp.c (ftp_retrieve_dirs): The bug where recursion into FTP - directories didn't work if logging in put you in a directory other - than "/" is fixed now. Removed the comment here warning of the bug. + directories didn't work if logging in put you in a directory other + than "/" is fixed now. Removed the comment here warning of the bug. * main.c (print_help): --continue's description was misleading. - We don't "restart", we "resume". Also, better to say - "partially-downloaded file" rather than just "existing file". + We don't "restart", we "resume". Also, better to say + "partially-downloaded file" rather than just "existing file". 2001-01-06 Dan Harkless @@@ -6969,13 -6882,13 +6984,13 @@@ 2000-11-30 Jan Prikryl - * ftp-ls.c (ftp_parse_unix_ls): Added second parameter - "ignore_perms" to ignore file and directory permissions for - Windows NT FTP server listings. - (ftp_parse_winnt_ls): New function. - (ftp_parse_ls): Parses UNIX and Windows NT listings - separately. Simple heuristics for distinguishing between UNIX - and MS-DOS-like FTP listing provided by Windows NT FTP service. + * ftp-ls.c (ftp_parse_unix_ls): Added second parameter + "ignore_perms" to ignore file and directory permissions for + Windows NT FTP server listings. + (ftp_parse_winnt_ls): New function. + (ftp_parse_ls): Parses UNIX and Windows NT listings + separately. Simple heuristics for distinguishing between UNIX + and MS-DOS-like FTP listing provided by Windows NT FTP service. 2000-11-29 John Summerfield @@@ -7476,29 -7389,29 +7491,29 @@@ 2000-10-27 Dan Harkless * retr.c (retrieve_url): Manually applied T. Bharath - 's patch to get wget to grok - illegal relative URL redirects. Reformatted and re-commented it. + 's patch to get wget to grok + illegal relative URL redirects. Reformatted and re-commented it. 2000-10-23 Dan Harkless * connect.c (make_connection and bindport): Manually applied Rob - Mayoff 's 1.5.3 patch to add --bind-address, - changing coding style to GNU's. + Mayoff 's 1.5.3 patch to add --bind-address, + changing coding style to GNU's. * ftp.c (ftp_loop_internal): --delete-after wasn't implemented for - files downloaded via FTP. Per a comment, .listing files were not + files downloaded via FTP. Per a comment, .listing files were not counted towards number of bytes and files downloaded because they're deleted anyway. Well, they aren't under -nr, so count them then. * init.c: Manually applied Rob Mayoff's 1.5.3 patch to add - --bind-address, alphabetizing, changing coding style to GNU's, - commenting, and renaming cmd_ip_address() to cmd_address() to - imply hostnames also okay. + --bind-address, alphabetizing, changing coding style to GNU's, + commenting, and renaming cmd_ip_address() to cmd_address() to + imply hostnames also okay. * main.c (main): --delete-after didn't delete the root of the - tree. Ignore --convert-links if --delete-after was specified. - Manually applied Rob Mayoff's 1.5.3 patch to add --bind-address, - fixing duplicate use of added-since-1.5.3 case value. + tree. Ignore --convert-links if --delete-after was specified. + Manually applied Rob Mayoff's 1.5.3 patch to add --bind-address, + fixing duplicate use of added-since-1.5.3 case value. (print_help): Clarified that --delete-after deletes local files. Rob forgot to add a line for his new --bind-address option. @@@ -7561,7 -7474,7 +7576,7 @@@ * ftp.c (ftp_retrieve_list): Use new INFINITE_RECURSION #define. * html.c: htmlfindurl() now takes final `dash_p_leaf_HTML' parameter. - Wrapped some > 80-column lines. When -p is specified and we're at a + Wrapped some > 80-column lines. When -p is specified and we're at a leaf node, do not traverse , , or tags other than . @@@ -7577,8 -7490,8 +7592,8 @@@ * options.h (struct options): Added new page_requisites field. * recur.c: Changed "URL-s" to "URLs" and "HTML-s" to "HTMLs". - Calculate and pass down new `dash_p_leaf_HTML' parameter to - get_urls_html(). Use new INFINITE_RECURSION #define. + Calculate and pass down new `dash_p_leaf_HTML' parameter to + get_urls_html(). Use new INFINITE_RECURSION #define. * retr.c: Changed "URL-s" to "URLs". get_urls_html() now takes final `dash_p_leaf_HTML' parameter. @@@ -7627,10 -7540,10 +7642,10 @@@ 2000-05-22 Dan Harkless * main.c (print_help): Added --help line for Damir Dzeko - 's until-now-undocumented --referer option. - Removed comments that --referer and --waitretry were undocumented. - Changed "`.wgetrc' command" to "`.wgetrc'-style command" on --help - line for --execute. + 's until-now-undocumented --referer option. + Removed comments that --referer and --waitretry were undocumented. + Changed "`.wgetrc' command" to "`.wgetrc'-style command" on --help + line for --execute. 2000-05-18 Hrvoje Niksic @@@ -7732,17 -7645,17 +7747,17 @@@ braces to avoid ambiguous `else'" warnings. Eliminated them. * http.c (gethttp): Dan Berger's query string patch is totally - bogus. If you have two different URLs, gen_page.cgi?page1 and - get_page.cgi?page2, they'll both be saved as get_page.cgi and the - second will overwrite the first. Also, parameters to implicit - CGIs, like "http://www.host.com/db/?2000-03-02" cause the URLs to - be printed with trailing garbage characters, and could seg fault. - Backing out the patch, which Dan B. informed me by email was just - a kludge to download StarOffice from Sun made necessary due to - wget's unconditional escaping of certain characters (room for an - option there?). + bogus. If you have two different URLs, gen_page.cgi?page1 and + get_page.cgi?page2, they'll both be saved as get_page.cgi and the + second will overwrite the first. Also, parameters to implicit + CGIs, like "http://www.host.com/db/?2000-03-02" cause the URLs to + be printed with trailing garbage characters, and could seg fault. + Backing out the patch, which Dan B. informed me by email was just + a kludge to download StarOffice from Sun made necessary due to + wget's unconditional escaping of certain characters (room for an + option there?). (http_loop): Heiko introduced "suggest explicit braces to avoid - ambiguous `else'" warnings. Eliminated them. + ambiguous `else'" warnings. Eliminated them. * main.c: Heiko's --wait / --waitretry backwards compatibility code looks to have been totally untested -- automatic variable @@@ -7804,16 -7717,16 +7819,16 @@@ * http.c (http_loop): Fixed a typo and clarified a comment. (http_loop): When -K and -N are specified together, compare size - and timestamp of server file X against local file X.orig (if - extant) rather than converted local file X. + and timestamp of server file X against local file X.orig (if + extant) rather than converted local file X. (http_loop): "Local file '%s' is more recent," is sometimes a lie - -- reworded as "Server file no newer than local file '%s' --". + -- reworded as "Server file no newer than local file '%s' --". (http_loop): Call new downloaded_file() function to prevent wrongful overwriting of .orig file when -N is specified. * url.c (convert_links): When -K specified, only rename X to - X.orig if downloaded_file() returns TRUE. Otherwise when we skip - file X due to -N, we clobber an X.orig from a previous invocation. + X.orig if downloaded_file() returns TRUE. Otherwise when we skip + file X due to -N, we clobber an X.orig from a previous invocation. (convert_links): Call the failsafe xstrdup(), not the real strdup(). (convert_links): Added a note asking anyone who understands how multiple URLs can correspond to a single file to comment it. @@@ -7872,7 -7785,7 +7887,7 @@@ 1998-09-10 Howard Gayle * url.c (get_urls_html): Would drop the last character of the - link. + link. 1998-09-10 Hrvoje Niksic @@@ -7920,7 -7833,7 +7935,7 @@@ 1998-06-16 Hrvoje Niksic * url.c (get_urls_html): Use malloc() instead of alloca in the - loop. + loop. 1998-06-13 Hrvoje Niksic @@@ -7963,7 -7876,7 +7978,7 @@@ 1998-05-27 Hrvoje Niksic * ftp.c (getftp): Added `break'; suggested by Lin Zhe Min - . + . 1998-05-24 Hrvoje Niksic @@@ -7998,7 -7911,7 +8013,7 @@@ 1998-05-05 Hrvoje Niksic * http.c (parse_http_status_line): Avoid `minor' and `major' - names. + names. 1998-05-02 Hrvoje Niksic @@@ -8038,11 -7951,11 +8053,11 @@@ (numdigit): Use `while' loop. * http.c (create_authorization_line): Detect authentication - schemes case-insensitively. + schemes case-insensitively. * http.c (extract_header_attr): Use strdupdelim(). (digest_authentication_encode): Move declaration of local - variables to smaller scope. + variables to smaller scope. (digest_authentication_encode): Reset REALM, OPAQUE and NONCE. (create_authorization_line): Detect authentication schemes case-insensitively. @@@ -8089,7 -8002,7 +8104,7 @@@ * headers.c (header_get): New argument FLAGS. * http.c (gethttp): If request is malformed, bail out of the - header loop. + header loop. (gethttp): Check for empty header *after* the status line checks. (gethttp): Disallow continuations for status line. @@@ -8172,7 -8085,7 +8187,7 @@@ * utils.c (mkdirhier): Use 0777 instead of opt.dirmode. * init.c (cmd_spec_dotstyle): Use 48 dots per line for binary - style. + style. (cmd_permissions): Removed. * config.h.in: Add template for WORDS_BIGENDIAN. @@@ -8233,7 -8146,7 +8248,7 @@@ 1998-03-17 Hrvoje Niksic * utils.c (memfatal): Set save_log_p to 0 to avoid potential - infloop. + infloop. * log.c: do_logging -> save_log_p. @@@ -8275,7 -8188,7 +8290,7 @@@ 1998-03-07 Tim Adam * recur.c (parse_robots): Correctly reset `entries' on empty - disallow. + disallow. 1998-03-07 Hrvoje Niksic @@@ -8317,7 -8230,7 +8332,7 @@@ * url.c (add_url): Add to the head of the list. * ftp.c (ftp_retrieve_list): Set the permissions to downloaded - file. + file. (getftp): Set the default permissions to 0600. 1998-02-21 Hrvoje Niksic @@@ -8396,9 -8309,9 +8411,9 @@@ * wget.h (FREE_MAYBE): New macro. * http.c (create_authorization_line): Don't use ANSI C string - concatenation feature. + concatenation feature. (basic_authentication_encode): Use alloca() for temporary - variables. + variables. * recur.h: Ditto. @@@ -8423,7 -8336,7 +8438,7 @@@ (calculate_skey_response): Use alloca(). * http.c (create_authorization_line): Work with FSF's version of - md5.c. + md5.c. * md5.c: New file, from GNU libc. @@@ -8467,7 -8380,7 +8482,7 @@@ * ftp.c (ftp_loop): Determine `filename' more precisely. * init.c (setval): Don't set `opt.quiet' if output-document is - `-'. + `-'. * log.c (log_init): Print to STDERR instead of STDOUT. (vlogmsg): Use STDERR by default. @@@ -8592,8 -8505,8 +8607,8 @@@ * main.c (print_help): Rearranged. (main): New long options for -n* short options: --no-directories, - --no-host-directories, --non-verbose, --no-host-lookup and - --dont-remove-listing. + --no-host-directories, --non-verbose, --no-host-lookup and + --dont-remove-listing. 1998-02-01 Hrvoje Niksic @@@ -8602,7 -8515,7 +8617,7 @@@ * log.c: New variable LOGFP. (vlogmsg): Use it. (redirect_output): Don't open /dev/null; set LOGFP to stdin - instead. + instead. (log_close): New function. * options.h (struct options): Removed LFILE. @@@ -8661,7 -8574,7 +8676,7 @@@ * host.c (ftp_getaddress): Use STRDUP_ALLOCA. (ftp_getaddress): Add diagnostics when reverse-lookup yields only - hostname. + hostname. 1998-01-31 Hrvoje Niksic @@@ -8672,7 -8585,7 +8687,7 @@@ * utils.c (proclist): Pass FNM_PATHNAME to fnmatch(). * ftp-basic.c (ftp_pasv): Avoid unnecessary casting to unsigned - char. + char. * log.c: Don't attempt to hide arguments from ansi2knr. @@@ -8685,9 -8598,9 +8700,9 @@@ * http.c (gethttp): Use it. * retr.c (get_contents): New argument EXPECTED; pass it to - show_progress(). + show_progress(). (show_progress): New argument EXPECTED; use it to display - percentages. + percentages. * init.c (setval): Ditto. @@@ -8729,7 -8642,7 +8744,7 @@@ * all: Use them. * sysdep.h: Add wrappers to ctype macros to make them - eight-bit-clean: + eight-bit-clean: 1998-01-30 Hrvoje Niksic @@@ -8743,7 -8656,7 +8758,7 @@@ 1997-02-27 Fila Kolodny * ftp.c (ftp_retrieve_list): If retrieving symlink and the proper - one already exists, just skip it. + one already exists, just skip it. 1998-01-30 Hrvoje Niksic @@@ -8778,7 -8691,7 +8793,7 @@@ (haccepts_none): Ditto. * main.c (main): Updated `--version' and `--help' output, as per - Francois Pinard's suggestions. + Francois Pinard's suggestions. * main.c: Include locale.h; call setlocale(), bindtextdomain() and textdomain(). @@@ -8844,7 -8757,7 +8859,7 @@@ * mswindows.c (ws_hangup): Use redirect_output(). * main.c (redirect_output_signal): New function; use - redirect_output(). + redirect_output(). * log.c (redirect_output): New function, based on hangup(), which is deleted. @@@ -8917,7 -8830,7 +8932,7 @@@ 1998-01-24 Karl Heuer * netrc.c (search_netrc): Initialize `l' only after processing - netrc. + netrc. * main.c (main): Don't trap SIGHUP if it's being ignored. @@@ -8945,7 -8858,7 +8960,7 @@@ (buf_fd): Ditto. * http.c (fetch_next_header): Use the BUF_READCHAR macro for - efficiency. + efficiency. (gethttp): Use alloca() where appropriate. * retr.c (buf_readchar): Use it. @@@ -8999,7 -8912,7 +9014,7 @@@ 1997-12-18 Hrvoje Niksic * all: Renamed nmalloc(), nrealloc() and nstrdup() to xmalloc(), - xrealloc() and xstrdup(). Use the new functions. + xrealloc() and xstrdup(). Use the new functions. * url.c (decode_string): Made static. (has_proto): Ditto. @@@ -9105,7 -9018,7 +9120,7 @@@ 1997-06-12 Hrvoje Niksic * cmpt.c (strptime_internal): Handle years more correctly for - `%y'. + `%y'. 1997-06-09 Mike Thomas @@@ -9172,7 -9085,7 +9187,7 @@@ * http.c (check_end): New function. (http_atotm): Use it. - + 1997-02-13 gilles Cedoc * http.c (gethttp): Use them. @@@ -9186,10 -9099,10 +9201,10 @@@ 1997-02-10 Hrvoje Niksic * recur.c (recursive_retrieve): Lowercase the host name, if the - URL is not "optimized". + URL is not "optimized". * host.c (realhost): Return l->hostname, even if it matches with - host. + host. 1997-02-10 Marin Purgar @@@ -9208,15 -9121,15 +9223,15 @@@ (skip_proto): Skip `//' correctly for FTP and HTTP. * url.c (get_urls_html): Handle bogus `http:' things a little - different. + different. * main.c (main): Removed `follow-ftp' from `f'. (main): Dumped the `prefix-files' and `file-prefix' options and - features; old and bogus. + features; old and bogus. (main): Exit on failed setval() in `-e'. * http.c (fetch_next_header): Use it to detect header continuation - correctly. + correctly. * retr.c (buf_peek): New function. @@@ -9316,7 -9229,7 +9331,7 @@@ * url.c (parseurl): New argument STRICT. * http.c (hparsestatline): Be a little-bit less strict about - status line format. + status line format. 1997-01-21 Hrvoje Niksic @@@ -9347,24 -9260,24 +9362,24 @@@ * version.c: "Released" 1.4.3-pre2. * recur.c (recursive_retrieve): Bypass host checking only if URL - is ftp AND parent URL is not ftp. + is ftp AND parent URL is not ftp. * ftp-basic.c (ftp_request): Print out Turtle Power. * ftp.c (ftp_loop): Call ftp_retrieve_glob with 0 if there's no - wildcard. + wildcard. (ftp_retrieve_glob): Call ftp_loop_internal even on empty list, if - not glob. + not glob. * http.c (gethttp): Be a little bit smarter about status codes. * recur.c (recursive_retrieve): Always reset opt.recursive when - dealing with FTP. + dealing with FTP. 1997-01-18 Hrvoje Niksic * retr.c (retrieve_url): New variable location_changed; use it for - tests instead of mynewloc. + tests instead of mynewloc. (retrieve_url): Allow heuristic adding of html. * url.c (url_filename): Don't use the `%' in Windows file names. @@@ -9378,7 -9291,7 +9393,7 @@@ * utils.c (my_touch): New function. * ftp.c (ftp_retrieve_list): Use #ifdef HAVE_STRUCT_UTIMBUF - instead of #ifndef NeXT. + instead of #ifndef NeXT. * utils.c (strptime): New version, by Ulrich Drepper. @@@ -9393,7 -9306,7 +9408,7 @@@ 1997-01-15 Hrvoje Niksic * html.c (ftp_index): Don't print minutes and seconds if we don't - know them; beautify the output. + know them; beautify the output. * ftp.c (getftp): Don't close the socket on FTPNSFOD. @@@ -9426,7 -9339,7 +9441,7 @@@ (ftp_parse_ls): Moved from ftp.c. (ftp_parse_unix_ls): Recognize seconds in time spec. (ftp_parse_unix_ls): Recognize year-less dates of the previous - year. + year. 1997-01-08 Hrvoje Niksic @@@ -9441,7 -9354,7 +9456,7 @@@ 1996-12-23 Hrvoje Niksic * url.c: Recognize finger, rlogin, tn3270, mid and cid as valid - schemes. + schemes. 1996-12-22 Hrvoje Niksic @@@ -9492,18 -9405,18 +9507,18 @@@ 1996-12-17 Hrvoje Niksic * retr.c (retrieve_url): Reset opt.recursion before calling - ftp_loop if it is reached through newloc. + ftp_loop if it is reached through newloc. * init.c (run_wgetrc): Print the wgetrc path too, when reporting - error; don't use "Syntax error", since we don't know if it is - really a syntax error. + error; don't use "Syntax error", since we don't know if it is + really a syntax error. 1996-12-16 Hrvoje Niksic * utils.c (acceptable): Extract the filename part of the path. * recur.c (recursive_retrieve): Call acceptable() with the right - argument; would bug out on wildcards. + argument; would bug out on wildcards. * init.c (parse_line): Likewise. @@@ -9523,7 -9436,7 +9538,7 @@@ * url.c (parseurl): Debug output. * utils.c (path_simplify): New one, adapted from bash's - canonicalize_pathname(). + canonicalize_pathname(). 1996-12-14 Hrvoje Niksic @@@ -9540,7 -9453,7 +9555,7 @@@ 1996-12-13 Hrvoje Niksic * init.c: Make excludes and includes under CVECDIR instead of - CVEC. + CVEC. 1996-12-13 Shawn McHorse @@@ -9557,7 -9470,7 +9572,7 @@@ 1996-12-12 Shawn McHorse * recur.c (retrieve_robots): Print the warning message only if - verbose. + verbose. 1996-12-12 Gregor Hoffleit @@@ -9579,24 -9492,24 +9594,24 @@@ 1996-12-13 Kaveh R. Ghazi * (configure.in, config.h.in, src/Makefile.in, src/*.[ch]): Add - ansi2knr support for compilers which don't support ANSI style - function prototypes and signatures. + ansi2knr support for compilers which don't support ANSI style + function prototypes and signatures. * (aclocal.m4, src/ansi2knr.c, src/ansi2knr.1): New files. 1996-11-26 Hrvoje Niksic * url.c: Use it; Recognize paths ending with "." and ".." as - directories. + directories. (url_filename): Append .n whenever file exists and could be a - directory. + directory. * url.h (ISDDOT): New macro. * init.c (parse_line): Use unsigned char. * url.c (get_urls_html): Cast to unsigned char * when calling - htmlfindurl. + htmlfindurl. * html.c (htmlfindurl): Use unsigned char. @@@ -9609,10 -9522,10 +9624,10 @@@ * ftp.c (getftp): Simplified assertion. (ftp_loop_internal): Remove symlink before downloading. (ftp_retrieve_list): Unlink the symlink name before attempting to - create a symlink! + create a symlink! * options.h (struct options): Renamed print_server_response to - server_response. + server_response. * ftp.c (rel_constr): Removed. (ftp_retrieve_list): Don't use it. @@@ -9627,12 -9540,12 +9642,12 @@@ 1996-11-24 Hrvoje Niksic * http.c (http_loop): Reset newloc in the beginning of function; - would cause FMR in retrieve_url. + would cause FMR in retrieve_url. 1996-11-23 Hrvoje Niksic * recur.c (convert_all_links): Find the URL of each HTML document, - and feed it to get_urls_html; would bug out. + and feed it to get_urls_html; would bug out. (convert_all_links): Check for l2 instead of dl; removed dl. * url.c (convert_links): Don't refer to freed newname. @@@ -9652,7 -9565,7 +9667,7 @@@ * Makefile.in (wget): Make `wget' the default target. * ftp.c (ftp_loop_internal): Move noclobber checking out of the - loop. + loop. (ftp_retrieve_list): Warn about non-matching sizes. * http.c (http_loop): Made -nc non-dependent on opt.recursive. @@@ -9666,7 -9579,7 +9681,7 @@@ 1996-11-21 Shawn McHorse * html.c (htmlfindurl): Reset s->in_quote after getting out of - quotes. + quotes. 1996-11-20 Hrvoje Niksic @@@ -9685,7 -9598,7 +9700,7 @@@ * init.c: New command htmlify. * ftp.c (getftp): Nicer error messages, with `'-encapsulated - strings. + strings. (ftp_loop): Print size of index.html. * init.c (setval): Implement "styles". @@@ -9694,14 -9607,14 +9709,14 @@@ 1996-11-19 Hrvoje Niksic - * ftp.c (getftp): Close the master socket in case of errors, after - bindport(). + * ftp.c (getftp): Close the master socket in case of errors, after + bindport(). - * connect.c (bindport): Initialize msock to -1. + * connect.c (bindport): Initialize msock to -1. - * ftp.c (getftp): Initialize dtsock to -1. + * ftp.c (getftp): Initialize dtsock to -1. - * connect.c (closeport): Don't close sock if sock == -1. + * connect.c (closeport): Don't close sock if sock == -1. 1996-11-18 Hrvoje Niksic @@@ -9719,7 -9632,7 +9734,7 @@@ * ftp.c (getftp): Initialize con->dltime. * recur.c (recursive_retrieve): Use same_host instead of - try_robots; simply load robots_txt whenever the host is changed. + try_robots; simply load robots_txt whenever the host is changed. (recursive_retrieve): Free forbidden before calling parse_robots. 1996-11-16 Hrvoje Niksic @@@ -9727,12 -9640,12 +9742,12 @@@ * retr.c (show_progress): Use them. * options.h (struct options): New options dot_bytes, dots_on_line - and dot_spacing. + and dot_spacing. 1996-11-16 Mark Boyns * recur.c (recursive_retrieve): Retrieve directories regardless of - acc/rej rules; check for empty u->file. + acc/rej rules; check for empty u->file. 1996-11-14 Hrvoje Niksic @@@ -9741,12 -9654,12 +9756,12 @@@ * utils.c (merge_vecs): New function. * init.c (setval): Reset the list-type functions when encountering - "". + "". 1996-11-14 Shawn McHorse * recur.c (recursive_retrieve): Use base_url instead of this_url - for no_parent. + for no_parent. 1996-11-14 Shawn McHorse @@@ -9757,7 -9670,7 +9772,7 @@@ * utils.c (sepstring): Rewrote; don't use strtok. * recur.c (recursive_retrieve): Enter assorted this_url to slist - when running the first time. + when running the first time. (retrieve_robots): Warn to ignore errors when robots are loaded. * utils.c (load_file): Moved from url.c. @@@ -9777,7 -9690,7 +9792,7 @@@ * ftp.c (ftp_retrieve_dirs): Implemented opt.includes. * init.c (setval): Free the existing opt.excludes and - opt.includes, if available. + opt.includes, if available. * main.c (main): New option -I. @@@ -9813,7 -9726,7 +9828,7 @@@ * http.c (gethttp): Free all_headers -- would leak. * recur.c (recursive_retrieve): Initialize depth to 1 instead of - 0 -- this fixes a long-standing bug in -rl. + 0 -- this fixes a long-standing bug in -rl. 1996-11-09 Hrvoje Niksic @@@ -9832,12 -9745,12 +9847,12 @@@ 1996-11-08 Hrvoje Niksic * url.c (url_filename): Do not create numbered suffixes if - opt.noclobber -- would bug out on -nc. + opt.noclobber -- would bug out on -nc. 1996-11-07 Hrvoje Niksic * recur.c (parse_robots): Don't chuck out the commands without - arguments (`Disallow:' didn't work). + arguments (`Disallow:' didn't work). (parse_robots): Compare versions lowercase. (parse_robots): Match on base_version, not version_string! (parse_robots): Handle comments properly. @@@ -9854,7 -9767,7 +9869,7 @@@ * init.c (run_wgetrc): Close fp. * ftp.c (ftp_retrieve_dirs): Allocate the correct length for - u->dir. + u->dir. 1996-11-06 Hrvoje Niksic @@@ -9866,12 -9779,12 +9881,12 @@@ (ftp_retrieve_glob): Return QUOTEXC on quota exceeded. * main.c (main): Check for quota by comparison with downloaded - stuff, not from status. + stuff, not from status. * connect.c (select_fd): Should compile on HPUX without warnings now. * ftp.c (ftp_get_listing): Check whether ftp_loop_internal - returned RETROK. + returned RETROK. 1996-11-04 Hrvoje Niksic @@@ -9887,7 -9800,7 +9902,7 @@@ 1996-11-02 Hrvoje Niksic * ftp.c (ftp_loop): Check for opt.ftp_glob too before calling - ftp_retrieve_glob. + ftp_retrieve_glob. * version.c: Changed version to 1.4.0-test2. @@@ -9896,7 -9809,7 +9911,7 @@@ * version.c: Released 1.4.0-test1. * url.c (str_url): Don't use sprintf when creating %2F-prefixed - directory. + directory. (convert_links): Removed definition of make_backup. * http.h: Removed definition of MAX_ERROR_LENGTH. @@@ -9908,7 -9821,7 +9923,7 @@@ * http.c (gethttp): Use ou->referer instead of u->referer. * retr.c (retrieve_url): Reset u to avoid freeing pointers twice; - this was known to cause coredumps on Linux. + this was known to cause coredumps on Linux. * html.c (ftp_index): Cast the argument to local_time to time_t *. @@@ -9917,14 -9830,14 +9932,14 @@@ * connect.c (select_fd): Use exceptfds -- once and for all. * retr.c (retrieve_from_file): Free filename after - recursive_retrieve. + recursive_retrieve. (retrieve_from_file): Send RFIRST_TIME to recursive_retrieve on - first-time retrieval. + first-time retrieval. (retrieve_from_file): Return uerr_t; new argument, count. (retrieve_from_file): Break on QUOTEXC. * init.c (setquota): Fixed a bug that caused rejection of - non-postfixed values.. + non-postfixed values.. 1996-10-30 Hrvoje Niksic @@@ -9932,33 -9845,33 +9947,33 @@@ * connect.c (iread): Smarter use of select. (select_fd): Set errno on timeout. If not timeout, return 1 - instead of 0. + instead of 0. 1996-10-29 Hrvoje Niksic * ftp.c (ftp_loop_internal): Don't use con->cmd before - establishing it. + establishing it. 1996-10-26 Hrvoje Niksic * http.c (gethttp): Send correct referer when using proxy. (gethttp): Use struct urlinfo ou to access the relevant data; send - correct authorization in all cases. + correct authorization in all cases. * host.c (same_host): Use skip_uname to skip username and - password. + password. * url.c (skip_uname): New function. (parseurl): Use it. * host.c (same_host): Do not assume HTTP -- same_host should now - be totally foolproof. + be totally foolproof. * url.c (skip_proto): New function. (parse_uname): Use it. * http.c (gethttp): Create local user and passwd from what is - given. + given. * url.c (parseurl): Check for HTTP username and password too. @@@ -9983,13 -9896,13 +9998,13 @@@ * options.h (struct options): New variable no_parent. * recur.c (recursive_retrieve): Only files are checked for - opt.accepts and opt.rejects. + opt.accepts and opt.rejects. (recursive_retrieve): Check directories for opt.excludes. (recursive_retrieve): Make the dir absolute when checking - opt.excludes. + opt.excludes. * html.c (htmlfindurl): Recognize and