From: Micah Cowan <micah@cowan.name>
Date: Fri, 28 Sep 2007 23:22:38 +0000 (-0700)
Subject: Merge from mainline
X-Git-Tag: v1.13~536
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=6633b74930870ffb148c46129c738af78082d934;hp=9c50f9356a56118c20ff6e3d970165ab4b12248f

Merge from mainline
---

diff --git a/AUTHORS b/AUTHORS
index 94adf57e..49a48ca6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,9 +28,9 @@ Ian Abbott.  Contributed bugfixes, Windows-related fixes, provided a
 prototype implementation of the new recursive code, and more.
 Co-maintained Wget during the 1.8 release cycle.
 
-Gisle Vanem.  Contributed Windows improvements, including a port of
-run_with_timeout to Windows, additions to Makefiles, and many bug
-reports and fixes.
+Gisle Vanem.  Contributed Windows and MS-DOS improvements, including a
+port of run_with_timeout to Windows, additions to Makefiles, and many
+bug reports and fixes.
 
 Mauro Tortonesi.  Improved IPv6 support, adding support for dual
 family systems.  Refactored and enhanced FTP IPv6 code. Maintained GNU
diff --git a/ChangeLog.README b/ChangeLog.README
index d50b0782..19394501 100644
--- a/ChangeLog.README
+++ b/ChangeLog.README
@@ -10,5 +10,7 @@ Please note that Wget has more than one ChangeLog file:
 
     windows/ChangeLog: documents only changes to files in the windows directory
 
+    msdos/ChangeLog: documents only changes to files in the msdos directory
+
 When checking to see if a patch you sent in has been applied, please
 look in the appropriate ChangeLog(s).
diff --git a/Makefile.in b/Makefile.in
index 6e81cd88..a680164e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 # 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
diff --git a/NEWS b/NEWS
index f7ae1f44..3393be2c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 GNU Wget NEWS -- history of user-visible changes.
 
-Copyright (C) 1997-2006 Free Software Foundation, Inc.
+Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2006, 2007 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send GNU Wget bug reports to <bug-wget@gnu.org>.
diff --git a/README b/README
index 552f9064..3fea5d49 100644
--- a/README
+++ b/README
@@ -59,7 +59,8 @@ the file AUTHORS for a list of major contributors, and the ChangeLogs
 for a detailed listing of all contributions.
 
 
-Copyright (C) 1995-2005 Free Software Foundation, Inc.
+Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+2005, 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
diff --git a/autogen.sh b/autogen.sh
index ffa392a8..0ebac1a5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
 
 # The (trivial) script for preparing the sources following the
 # checkout from version control.
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 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
diff --git a/config.guess b/config.guess
index 1fdbe609..cf224a15 100755
--- a/config.guess
+++ b/config.guess
@@ -1,7 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
+#   Foundation, Inc.
 
 timestamp='2005-05-27'
 
diff --git a/config.sub b/config.sub
index a8177597..c77979b2 100755
--- a/config.sub
+++ b/config.sub
@@ -1,7 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
+#   Foundation, Inc.
 
 timestamp='2005-06-02'
 
diff --git a/configure.bat b/configure.bat
index c340b3e0..179b313f 100755
--- a/configure.bat
+++ b/configure.bat
@@ -1,6 +1,6 @@
 @echo off
 rem Configure batch file for `Wget' utility
-rem Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+rem Copyright (C) 1995, 1996, 1997, 2007 Free Software Foundation, Inc.
 
 rem This program is free software; you can redistribute it and/or modify
 rem it under the terms of the GNU General Public License as published by
diff --git a/configure.in b/configure.in
index a9a7a7ab..703ee482 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Template file for GNU Autoconf
-dnl Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
+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
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 57ff2f57..8330e939 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for `wget' utility
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 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
diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl
index bcb276c6..9c6d8cc2 100755
--- a/doc/texi2pod.pl
+++ b/doc/texi2pod.pl
@@ -1,6 +1,7 @@
 #! /usr/bin/env perl
 
-#   Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+#   Copyright (C) 1999, 2000, 2001, 2003, 2007 Free Software
+#   Foundation, Inc.
 
 # This file is part of GCC.
 
diff --git a/doc/wget.texi b/doc/wget.texi
index 5ed1c6a7..c4bb4942 100644
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -3625,6 +3625,18 @@ layout and many other things.
 Junio Hamano---donated support for Opie and @sc{http} @code{Digest}
 authentication.
 
+@item
+Mauro Tortonesi---Improved IPv6 support, adding support for dual
+family systems.  Refactored and enhanced FTP IPv6 code. Maintained GNU
+Wget from 2004--2007.
+
+@item
+Christopher G.@: Lewis---Maintenance of the Windows version of GNU WGet.
+
+@item
+Gisle Vanem---Many helpful patches and improvements, especially for
+Windows and MS-DOS support.
+
 @item
 People who provided donations for development---including Brian Gough.
 @end itemize
@@ -3639,7 +3651,7 @@ Martin Baehr,
 Dieter Baron,
 Roger Beeman,
 Dan Berger,
-T. Bharath,
+T.@: Bharath,
 Christian Biere,
 Paul Bludov,
 Daniel Bodea,
@@ -3680,7 +3692,7 @@ Aleksandar Erkalovic,
 Andy Eskilsson,
 Christian Fraenkel,
 David Fritz,
-Charles C. Fu,
+Charles C.@: Fu,
 FUJISHIMA Satsuki,
 Masashi Fujita,
 Howard Gayle,
@@ -3735,7 +3747,7 @@ Simos KSenitellis,
 @end ifnottex
 Christian Lackas,
 Hrvoje Lacko,
-Daniel S. Lewart,
+Daniel S.@: Lewart,
 @iftex
 Nicol@'{a}s Lichtmeier,
 @end iftex
@@ -3743,7 +3755,7 @@ Nicol@'{a}s Lichtmeier,
 Nicolas Lichtmeier,
 @end ifnottex
 Dave Love,
-Alexander V. Lukyanov,
+Alexander V.@: Lukyanov,
 @iftex
 Thomas Lu@ss{}nig,
 @end iftex
@@ -3752,16 +3764,16 @@ Thomas Lussnig,
 @end ifnottex
 Andre Majorel,
 Aurelien Marchand,
-Matthew J. Mellon,
+Matthew J.@: Mellon,
 Jordan Mendelson,
 Lin Zhe Min,
 Jan Minar,
 Tim Mooney,
 Keith Moore,
-Adam D. Moss,
+Adam D.@: Moss,
 Simon Munton,
 Charlie Negyesi,
-R. K. Owen,
+R.@: K.@: Owen,
 Leonid Petrov,
 Simone Piunno,
 Andrew Pollock,
@@ -3783,6 +3795,7 @@ Keith Refson,
 Bill Richardson,
 Tyler Riddle,
 Tobias Ringstrom,
+Jochen Roderburg,
 @c Texinfo doesn't grok @'{@i}, so we have to use TeX itself.
 @tex
 Juan Jos\'{e} Rodr\'{\i}guez,
@@ -3790,13 +3803,13 @@ Juan Jos\'{e} Rodr\'{\i}guez,
 @ifnottex
 Juan Jose Rodriguez,
 @end ifnottex
-Maciej W. Rozycki,
-Edward J. Sabol,
+Maciej W.@: Rozycki,
+Edward J.@: Sabol,
 Heinz Salzmann,
 Robert Schmidt,
 Nicolas Schodet,
 Andreas Schwab,
-Steven M. Schweda,
+Steven M.@: Schweda,
 Chris Seawood,
 Dennis Smit,
 Toomas Soome,
@@ -3820,7 +3833,9 @@ Russell Vincent,
 Zeljko Vrba,
 @end ifnottex
 Charles G Waldman,
-Douglas E. Wegscheid,
+Douglas E.@: Wegscheid,
+Ralf Wildenhues,
+Joshua David Williams,
 YAMAZAKI Makoto,
 Jasmin Zainul,
 @iftex
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
index 96c4e2c3..8d995251 100644
--- a/m4/lib-ld.m4
+++ b/m4/lib-ld.m4
@@ -1,5 +1,6 @@
 # lib-ld.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
+dnl Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+dnl 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index ea0b0c4e..d4450fce 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,5 +1,6 @@
 # lib-link.m4 serial 6 (gettext-0.14.3)
-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
+dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 0d895ca6..a3d482d3 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,5 +1,6 @@
 # lib-prefix.m4 serial 4 (gettext-0.14.2)
-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
+dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wget.m4 b/m4/wget.m4
index 2dc8b348..736bd2eb 100644
--- a/m4/wget.m4
+++ b/m4/wget.m4
@@ -1,5 +1,6 @@
 dnl Wget-specific Autoconf macros.
-dnl Copyright (C) 1996-2005, 2007 Free Software Foundation, Inc.
+dnl Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+dnl 2004, 2005, 2006, 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
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
new file mode 100644
index 00000000..dcf81278
--- /dev/null
+++ b/msdos/ChangeLog
@@ -0,0 +1,4 @@
+2007-09-24  Gisle Vanem  <giva@bgnett.no>
+
+	* Makefile.DJ, config.h: Added to support building on MS-DOS via
+	DJGPP.
diff --git a/msdos/Makefile.DJ b/msdos/Makefile.DJ
new file mode 100644
index 00000000..bed35cd1
--- /dev/null
+++ b/msdos/Makefile.DJ
@@ -0,0 +1,67 @@
+#
+# GNU Makefile for wget / djgpp / MSDOS.
+# By Gisle Vanem <giva@bgnett.no>.
+#
+.SUFFIXES: .exe .map
+
+USE_OPENSSL = 0
+USE_IPV6    = 1
+
+OPENSSL_ROOT = e:/net/OpenSSL.099
+ZLIB_ROOT    = e:/djgpp/contrib/zlib
+
+VPATH   = ../src
+OBJ_DIR = djgpp.obj
+CC      = gcc
+CFLAGS  = -O2 -g -Wall -Wcast-align -I. -I../src -I/dev/env/WATT_ROOT/inc \
+          -DHAVE_CONFIG_H -DENABLE_DEBUG
+
+# LDFLAGS = -s
+
+ifeq ($(USE_OPENSSL),1)
+  CFLAGS  += -DHAVE_OPENSSL -DHAVE_SSL -I$(OPENSSL_ROOT)
+  EX_LIBS += $(OPENSSL_ROOT)/lib/libssl.a $(OPENSSL_ROOT)/lib/libcrypt.a \
+             $(ZLIB_ROOT)/libz.a
+  SOURCES  = ../src/openssl.c ../src/http-ntlm.c
+endif
+
+ifeq ($(USE_IPV6),1)
+  CFLAGS += -DENABLE_IPV6
+endif
+
+EX_LIBS += /dev/env/WATT_ROOT/lib/libwatt.a
+
+SOURCES += $(addprefix ../src/, cmpt.c connect.c cookies.c ftp.c ftp-basic.c \
+             ftp-ls.c ftp-opie.c getopt.c hash.c host.c html-parse.c html-url.c \
+             http.c init.c log.c main.c gen-md5.c gnu-md5.c netrc.c progress.c \
+             recur.c res.c retr.c safe-ctype.c url.c utils.c version.c convert.c \
+             xmalloc.c ptimer.c spider.c)
+
+OBJECTS = $(addprefix $(OBJ_DIR)/, $(notdir $(SOURCES:.c=.o)))
+
+all: $(OBJ_DIR) ../wget-dos.exe
+	@echo 'Welcome to Wget'
+
+$(OBJ_DIR):
+	mkdir $(OBJ_DIR)
+
+../wget-dos.exe: $(OBJECTS)
+	$(CC) $(LDFLAGS) -o $@ $^ $(EX_LIBS)
+
+clean:
+	rm -f $(OBJECTS) $(MAPFILE)
+
+vclean realclean: clean
+	rm -f ../wget-dos.exe depend.dj
+	- rmdir $(OBJ_DIR)
+
+$(OBJ_DIR)/%.o: %.c
+	$(CC) $(CFLAGS) -o $@ -c $<
+	@echo
+
+depend:
+	$(CC) -MM $(CFLAGS) $(SOURCES) | \
+        sed -e 's/^\([a-zA-Z0-9_-]*\.o:\)/$$(OBJ_DIR)\/\1/' > depend.dj
+
+-include depend.dj
+
diff --git a/msdos/config.h b/msdos/config.h
new file mode 100644
index 00000000..f43ab4ec
--- /dev/null
+++ b/msdos/config.h
@@ -0,0 +1,143 @@
+/* Configuration header file for MS-DOS/Watt-32
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This file is part of GNU Wget.
+
+   GNU Wget 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.
+
+   GNU Wget 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 Wget.  If not, see <http://www.gnu.org/licenses/>.
+
+   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.  */
+
+
+#ifndef CONFIG_DOS_H
+#define CONFIG_DOS_H
+
+#include <stdlib.h>
+#include <limits.h>
+#include <tcp.h>
+#include <malloc.h>
+
+#ifdef __DJGPP__
+#include <sys/config.h>
+#endif
+
+#include <sys/errno.h>
+
+#if defined(__WATCOMC__) && (__WATCOMC__ >= 1250)  /* OW 1.5+ */
+  #define OPENWATCOM_15
+#endif
+
+#if defined(__HIGHC__)
+  #define inline
+  #define HAVE_UNISTD_H 1
+  #define HAVE_UTIME_H 1
+#endif
+
+#if defined(__WATCOMC__) || defined(__BORLANDC__)
+  #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_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
+
+  #if (DJGPP_MINOR >= 4)
+    #include <stdbool.h>
+    #define HAVE_SNPRINTF 1
+    #define HAVE_VSNPRINTF 1
+    #define HAVE_UINT32_T 1
+  #endif
+#endif
+
+#ifdef __HIGHC__
+  #define HAVE_STRUCT_UTIMBUF 1
+  #define HAVE_UTIME_H 1
+#endif
+
+#ifdef OPENWATCOM_15
+  #define HAVE_STRCASECMP
+  #define HAVE_STRNCASECMP
+#endif
+
+#define HAVE_GETHOSTBYNAME 1
+#define HAVE_GETHOSTNAME 1
+#define HAVE_SELECT 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
+#define socklen_t    int
+
+#define sock_read    wget_sock_read
+#define sock_write   wget_sock_write
+#define sock_close   wget_sock_close
+
+#if defined(__DJGPP__)
+  #define MKDIR(p,a) mkdir(p,a)
+#else
+  #define strcasecmp stricmp
+  #define MKDIR(p,a) mkdir(p)
+#endif
+
+#if !defined(MSDOS)
+#define MSDOS
+#endif
+
+#endif  /* CONFIG_DOS_H */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 12e543cd..cd6c7975 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,6 @@
 # List of files which containing translatable strings.
-# Copyright (C) 1998 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+# 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 # Package source files
 src/cmpt.c
diff --git a/src/ChangeLog b/src/ChangeLog
index 17e39860..e0583343 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-24  Gisle Vanem  <giva@bgnett.no>
+
+	* connect.c, init.c, main.c, openssl.c, options.h, sysdep.h,
+	url.c, utils.c: Added support for building on MS-DOS.
+
 2007-09-24  Jochen Roderburg  <roderburg@uni-koeln.de>
 
 	* http.c (http_zero): Remove no-longer-used local_size variable.
diff --git a/src/Makefile.in b/src/Makefile.in
index e393e1e0..9424a690 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,6 @@
 # Makefile for `wget' utility
-# Copyright (C) 1995-2006 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+# 2004, 2005, 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
diff --git a/src/cmpt.c b/src/cmpt.c
index f5f25674..1977e8ea 100644
--- a/src/cmpt.c
+++ b/src/cmpt.c
@@ -1,5 +1,6 @@
 /* Replacements for routines missing on some systems.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/connect.c b/src/connect.c
index 11d6e193..5e7ccee6 100644
--- a/src/connect.c
+++ b/src/connect.c
@@ -1,5 +1,6 @@
 /* Establishing and handling network connections.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -668,7 +669,7 @@ test_socket_open (int sock)
 
 /* Basic socket operations, mostly EINTR wrappers.  */
 
-#ifdef WINDOWS
+#if defined(WINDOWS) || defined(MSDOS)
 # define read(fd, buf, cnt) recv (fd, buf, cnt, 0)
 # define write(fd, buf, cnt) send (fd, buf, cnt, 0)
 # define close(fd) closesocket (fd)
diff --git a/src/connect.h b/src/connect.h
index de6899cc..70245b71 100644
--- a/src/connect.h
+++ b/src/connect.h
@@ -1,5 +1,6 @@
 /* Declarations for connect.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/convert.c b/src/convert.c
index 0b5bb435..8f04ed0c 100644
--- a/src/convert.c
+++ b/src/convert.c
@@ -1,5 +1,5 @@
 /* Conversion of links to local files.
-   Copyright (C) 2003-2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/convert.h b/src/convert.h
index 93efa769..ccf75c0c 100644
--- a/src/convert.h
+++ b/src/convert.h
@@ -1,5 +1,5 @@
 /* Declarations for convert.c
-   Copyright (C) 2003-2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/cookies.c b/src/cookies.c
index 7c9a5757..d3b64a9f 100644
--- a/src/cookies.c
+++ b/src/cookies.c
@@ -1,5 +1,6 @@
 /* Support for cookies.
-   Copyright (C) 2001-2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free
+   Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/cookies.h b/src/cookies.h
index 48058ae6..1ceb61cd 100644
--- a/src/cookies.h
+++ b/src/cookies.h
@@ -1,5 +1,6 @@
 /* Support for cookies.
-   Copyright (C) 2001-2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free
+   Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/ftp-basic.c b/src/ftp-basic.c
index 70291393..9df26849 100644
--- a/src/ftp-basic.c
+++ b/src/ftp-basic.c
@@ -1,5 +1,6 @@
 /* Basic FTP routines.
-   Copyright (C) 1996-2007 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/ftp-ls.c b/src/ftp-ls.c
index 062d57e3..97d725f6 100644
--- a/src/ftp-ls.c
+++ b/src/ftp-ls.c
@@ -1,5 +1,6 @@
 /* Parsing FTP `ls' output.
-   Copyright (C) 1996-2004 Free Software Foundation, Inc. 
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc. 
 
 This file is part of GNU Wget.
 
diff --git a/src/ftp-opie.c b/src/ftp-opie.c
index 5409b594..2159298a 100644
--- a/src/ftp-opie.c
+++ b/src/ftp-opie.c
@@ -1,5 +1,6 @@
 /* Opie (s/key) support for FTP.
-   Copyright (C) 1998-2004 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/ftp.c b/src/ftp.c
index 7da68afa..2f5ecd15 100644
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -1,5 +1,6 @@
 /* File Transfer Protocol support.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/ftp.h b/src/ftp.h
index 3bdc4f7e..eef63b66 100644
--- a/src/ftp.h
+++ b/src/ftp.h
@@ -1,5 +1,6 @@
 /* Declarations for FTP support.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/gen-md5.c b/src/gen-md5.c
index d9b72614..91ece6ff 100644
--- a/src/gen-md5.c
+++ b/src/gen-md5.c
@@ -1,5 +1,6 @@
 /* General MD5 support.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
+   Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/gen-md5.h b/src/gen-md5.h
index f833d3a7..25d3ba57 100644
--- a/src/gen-md5.h
+++ b/src/gen-md5.h
@@ -1,5 +1,6 @@
 /* General MD5 header file.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
+   Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/gnu-md5.c b/src/gnu-md5.c
index d8de43c1..95e314e8 100644
--- a/src/gnu-md5.c
+++ b/src/gnu-md5.c
@@ -1,6 +1,6 @@
 /* md5.c - Functions to compute MD5 message digest of files or memory blocks
    according to the definition of MD5 in RFC 1321 from April 1992.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/src/gnu-md5.h b/src/gnu-md5.h
index ab9ede11..fef0a65a 100644
--- a/src/gnu-md5.h
+++ b/src/gnu-md5.h
@@ -1,6 +1,6 @@
 /* md5.h - Declaration of functions and data types used for MD5 sum
    computing library functions.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 2007 Free Software Foundation, Inc.
    NOTE: The canonical source of this file is maintained with the GNU C
    Library.  Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 
diff --git a/src/gnutls.c b/src/gnutls.c
index 110d639c..92c07807 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1,5 +1,5 @@
 /* SSL support via GnuTLS library.
-   Copyright (C) 2005-2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/hash.c b/src/hash.c
index dbef2828..5d156da8 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -1,5 +1,6 @@
 /* Hash tables.
-   Copyright (C) 2000-2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free
+   Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/hash.h b/src/hash.h
index 2c036848..6003af1a 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -1,5 +1,5 @@
 /* Hash table declarations.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/host.c b/src/host.c
index 893dded0..fee5e404 100644
--- a/src/host.c
+++ b/src/host.c
@@ -1,5 +1,6 @@
 /* Host name resolution and matching.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/host.h b/src/host.h
index 03b88c81..12ddf3ae 100644
--- a/src/host.h
+++ b/src/host.h
@@ -1,5 +1,6 @@
 /* Declarations for host.c
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/html-parse.c b/src/html-parse.c
index 9952a833..243ead23 100644
--- a/src/html-parse.c
+++ b/src/html-parse.c
@@ -1,5 +1,6 @@
 /* HTML parser for Wget.
-   Copyright (C) 1998-2006 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/html-parse.h b/src/html-parse.h
index cfec60b5..3d9afab1 100644
--- a/src/html-parse.h
+++ b/src/html-parse.h
@@ -1,5 +1,6 @@
 /* Declarations for html-parse.c.
-   Copyright (C) 1998-2006 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/html-url.c b/src/html-url.c
index b5da0781..97443ea0 100644
--- a/src/html-url.c
+++ b/src/html-url.c
@@ -1,5 +1,6 @@
 /* Collect URLs from HTML source.
-   Copyright (C) 1998-2006 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/http-ntlm.c b/src/http-ntlm.c
index 0d5c9fec..054c8a95 100644
--- a/src/http-ntlm.c
+++ b/src/http-ntlm.c
@@ -1,5 +1,5 @@
 /* NTLM code.
-   Copyright (C) 2005-2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
    Contributed by Daniel Stenberg.
 
 This file is part of GNU Wget.
diff --git a/src/http-ntlm.h b/src/http-ntlm.h
index 6460d0d1..9d176101 100644
--- a/src/http-ntlm.h
+++ b/src/http-ntlm.h
@@ -1,7 +1,7 @@
 #ifndef __HTTP_NTLM_H
 #define __HTTP_NTLM_H
 /* Declarations for http_ntlm.c
-   Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 2000, 2007 Free Software Foundation, Inc.
    Contributed by Daniel Stenberg.
 
 This file is part of GNU Wget.
diff --git a/src/http.c b/src/http.c
index 6dd5158c..b664d45f 100644
--- a/src/http.c
+++ b/src/http.c
@@ -1,5 +1,6 @@
 /* HTTP support.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/http.h b/src/http.h
index 86c0247b..42bd2045 100644
--- a/src/http.h
+++ b/src/http.h
@@ -1,5 +1,5 @@
 /* Declarations for HTTP.
-   Copyright (C) 2005-2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/init.c b/src/init.c
index 7d861922..20ca99be 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1,5 +1,6 @@
 /* Reading/parsing the initialization file.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -103,7 +104,7 @@ CMD_DECLARE (cmd_spec_verbose);
    add any entries that allocate memory (e.g. cmd_string and
    cmd_vector) to the cleanup() function below. */
 
-static struct {
+static const struct {
   const char *name;
   void *place;
   bool (*action) (const char *, const char *, void *);
@@ -241,7 +242,10 @@ static struct {
   { "useragent",        NULL,                   cmd_spec_useragent },
   { "verbose",          NULL,                   cmd_spec_verbose },
   { "wait",             &opt.wait,              cmd_time },
-  { "waitretry",        &opt.waitretry,         cmd_time }
+  { "waitretry",        &opt.waitretry,         cmd_time },
+#ifdef MSDOS
+  { "wdebug",           &opt.wdebug,            cmd_boolean },
+#endif
 };
 
 /* Look up CMDNAME in the commands[] and return its position in the
@@ -313,10 +317,10 @@ defaults (void)
 #endif
 
   /* The default for file name restriction defaults to the OS type. */
-#if !defined(WINDOWS) && !defined(__CYGWIN__)
-  opt.restrict_files_os = restrict_unix;
-#else
+#if defined(WINDOWS) || defined(MSDOS) || defined(__CYGWIN__)
   opt.restrict_files_os = restrict_windows;
+#else
+  opt.restrict_files_os = restrict_unix;
 #endif
   opt.restrict_files_ctrl = true;
   opt.restrict_files_case = restrict_no_case_restriction;
@@ -333,14 +337,27 @@ home_dir (void)
 
   if (!home)
     {
-#ifndef WINDOWS
+#if defined(MSDOS)
+      /* Under MSDOS, if $HOME isn't defined, use the directory where
+         `wget.exe' resides.  */
+      const char *_w32_get_argv0 (void); /* in libwatt.a/pcconfig.c */
+      char *p, buf[PATH_MAX];
+
+      strcpy (buf, _w32_get_argv0 ());
+      p = strrchr (buf, '/');            /* djgpp */
+      if (!p)
+        p = strrchr (buf, '\\');          /* others */
+      assert (p);
+      *p = '\0';
+      home = buf;
+#elif !defined(WINDOWS)
       /* If HOME is not defined, try getting it from the password
          file.  */
       struct passwd *pwd = getpwuid (getuid ());
       if (!pwd || !pwd->pw_dir)
         return NULL;
       home = pwd->pw_dir;
-#else  /* WINDOWS */
+#else  /* !WINDOWS */
       /* Under Windows, if $HOME isn't defined, use the directory where
          `wget.exe' resides.  */
       home = ws_mypath ();
@@ -750,10 +767,10 @@ cmd_string (const char *com, const char *val, void *place)
   return true;
 }
 
-#ifndef WINDOWS
-# define ISSEP(c) ((c) == '/')
-#else
+#if defined(WINDOWS) || defined(MSDOS)
 # define ISSEP(c) ((c) == '/' || (c) == '\\')
+#else
+# define ISSEP(c) ((c) == '/')
 #endif
 
 /* Like the above, but handles tilde-expansion when reading a user's
@@ -791,7 +808,7 @@ cmd_file (const char *com, const char *val, void *place)
       *pstring = concat_strings (home, "/", val, (char *) 0);
     }
 
-#ifdef WINDOWS
+#if defined(WINDOWS) || defined(MSDOS)
   /* Convert "\" to "/". */
   {
     char *s;
diff --git a/src/init.h b/src/init.h
index a8b4ef41..9537297c 100644
--- a/src/init.h
+++ b/src/init.h
@@ -1,5 +1,6 @@
 /* Declarations for init.c.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/log.c b/src/log.c
index f788f5e4..9bd0a5a7 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,5 +1,6 @@
 /* Messages logging.
-   Copyright (C) 1998-2006 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/log.h b/src/log.h
index 2e802f52..394ac7bd 100644
--- a/src/log.h
+++ b/src/log.h
@@ -1,5 +1,6 @@
 /* Declarations for log.c.
-   Copyright (C) 1998-2006 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/main.c b/src/main.c
index 4f0c123c..74435888 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,6 @@
 /* Command line parsing.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -244,6 +245,9 @@ static struct cmdline_option option_data[] =
     { "version", 'V', OPT_FUNCALL, (void *) print_version, no_argument },
     { "wait", 'w', OPT_VALUE, "wait", -1 },
     { "waitretry", 0, OPT_VALUE, "waitretry", -1 },
+#ifdef MSDOS
+    { "wdebug", 0, OPT_BOOLEAN, "wdebug", -1 },
+#endif
   };
 
 #undef WHEN_DEBUG
@@ -386,6 +390,10 @@ Logging and input file:\n"),
 #ifdef ENABLE_DEBUG
     N_("\
   -d,  --debug               print lots of debugging information.\n"),
+#endif
+#ifdef MSDOS
+    N_("\
+       --wdebug              print Watt-32 debug output.\n"),
 #endif
     N_("\
   -q,  --quiet               quiet (no output).\n"),
@@ -680,6 +688,7 @@ There is NO WARRANTY, to the extent permitted by law.\n"), stdout);
   exit (0);
 }
 
+
 int
 main (int argc, char *const *argv)
 {
@@ -891,8 +900,14 @@ Can't timestamp and not clobber old files at the same time.\n"));
       exit (1);
     }
 
+#ifdef MSDOS
+  if (opt.wdebug)
+     dbug_init();
+  sock_init();
+#else
   if (opt.background)
     fork_to_background ();
+#endif
 
   /* Initialize progress.  Have to do this after the options are
      processed so we know where the log file is.  */
diff --git a/src/mswindows.c b/src/mswindows.c
index 7b310678..de031cb0 100644
--- a/src/mswindows.c
+++ b/src/mswindows.c
@@ -1,5 +1,6 @@
 /* mswindows.c -- Windows-specific support
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/mswindows.h b/src/mswindows.h
index e298e066..da0665d0 100644
--- a/src/mswindows.h
+++ b/src/mswindows.h
@@ -1,5 +1,6 @@
 /* Declarations for windows
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/netrc.c b/src/netrc.c
index bf5f5516..87c8c94b 100644
--- a/src/netrc.c
+++ b/src/netrc.c
@@ -1,5 +1,5 @@
 /* Read and parse the .netrc file to get hosts, accounts, and passwords.
-   Copyright (C) 1996, Free Software Foundation, Inc.
+   Copyright (C) 1996, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/netrc.h b/src/netrc.h
index 1b26a0cb..91ced5a0 100644
--- a/src/netrc.h
+++ b/src/netrc.h
@@ -1,5 +1,5 @@
 /* Declarations for netrc.c
-   Copyright (C) 1996, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1996, 1997, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/openssl.c b/src/openssl.c
index 71faa0c0..7427f34d 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -1,5 +1,6 @@
 /* SSL support via OpenSSL library.
-   Copyright (C) 2000-2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free
+   Software Foundation, Inc.
    Originally contributed by Christian Fraenkel.
 
 This file is part of GNU Wget.
@@ -356,7 +357,7 @@ openssl_close (int fd, void *arg)
   xfree_null (ctx->last_error);
   xfree (ctx);
 
-#ifdef WINDOWS
+#if defined(WINDOWS) || defined(MSDOS)
   closesocket (fd);
 #else
   close (fd);
diff --git a/src/options.h b/src/options.h
index 7fda95e3..0480acb9 100644
--- a/src/options.h
+++ b/src/options.h
@@ -1,5 +1,6 @@
 /* struct options.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -131,6 +132,10 @@ struct options
   bool debug;			/* Debugging on/off */
 #endif
 
+#ifdef MSDOS
+  bool wdebug;                  /* Watt-32 tcp/ip debugging on/off */
+#endif
+
   bool timestamping;		/* Whether to use time-stamping. */
 
   bool backup_converted;	/* Do we save pre-converted files as *.orig? */
diff --git a/src/progress.c b/src/progress.c
index 0296afdc..6dd96018 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -1,5 +1,6 @@
 /* Download progress.
-   Copyright (C) 2001-2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
+   Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/progress.h b/src/progress.h
index 2580196d..c5862ed0 100644
--- a/src/progress.h
+++ b/src/progress.h
@@ -1,5 +1,6 @@
 /* Download progress.
-   Copyright (C) 2001-2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
+   Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/ptimer.c b/src/ptimer.c
index 12bb7f48..33ed913f 100644
--- a/src/ptimer.c
+++ b/src/ptimer.c
@@ -1,5 +1,5 @@
 /* Portable timers.
-   Copyright (C) 2005-2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/ptimer.h b/src/ptimer.h
index 3ef9931a..d256d56b 100644
--- a/src/ptimer.h
+++ b/src/ptimer.h
@@ -1,5 +1,5 @@
 /* Declarations for ptimer.c.
-   Copyright (C) 2005-2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/recur.c b/src/recur.c
index 57932f8d..acf0b16d 100644
--- a/src/recur.c
+++ b/src/recur.c
@@ -1,5 +1,6 @@
 /* Handling of recursive HTTP retrieving.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/recur.h b/src/recur.h
index 0d1da046..0a49e929 100644
--- a/src/recur.h
+++ b/src/recur.h
@@ -1,5 +1,6 @@
 /* Declarations for recur.c.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/res.c b/src/res.c
index 5910dd3e..56041229 100644
--- a/src/res.c
+++ b/src/res.c
@@ -1,5 +1,5 @@
 /* Support for Robot Exclusion Standard (RES).
-   Copyright (C) 2001,2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of Wget.
 
diff --git a/src/res.h b/src/res.h
index a0506776..bd7549f9 100644
--- a/src/res.h
+++ b/src/res.h
@@ -1,5 +1,5 @@
 /* Declarations for res.c.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
 
 This file is part of Wget.
 
diff --git a/src/retr.c b/src/retr.c
index ec07bc48..3234286b 100644
--- a/src/retr.c
+++ b/src/retr.c
@@ -1,5 +1,6 @@
 /* File retrieval.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/retr.h b/src/retr.h
index 9ebf2556..e89e7ed9 100644
--- a/src/retr.h
+++ b/src/retr.h
@@ -1,5 +1,6 @@
 /* Declarations for retr.c.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/spider.c b/src/spider.c
index 4baa2e72..37122ad1 100644
--- a/src/spider.c
+++ b/src/spider.c
@@ -1,5 +1,5 @@
 /* Keep track of visited URLs in spider mode.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/spider.h b/src/spider.h
index 1d7d13ee..dc040f9e 100644
--- a/src/spider.h
+++ b/src/spider.h
@@ -1,5 +1,5 @@
 /* Declarations for spider.c
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/ssl.h b/src/ssl.h
index 27c24946..85c3d189 100644
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -1,5 +1,6 @@
 /* SSL support.
-   Copyright (C) 2000-2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free
+   Software Foundation, Inc.
    Originally contributed by Christian Fraenkel.
 
 This file is part of GNU Wget.
diff --git a/src/sysdep.h b/src/sysdep.h
index 98b3c13b..9f775ce7 100644
--- a/src/sysdep.h
+++ b/src/sysdep.h
@@ -1,5 +1,6 @@
 /* Dirty system-dependent hacks.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -69,15 +70,15 @@ typedef unsigned char _Bool;
 # define __bool_true_false_are_defined 1
 #endif
 
-/* Needed for compilation under OS/2: */
-#ifdef __EMX__
+/* Needed for compilation under OS/2 and MSDOS */
+#if defined(__EMX__) || defined(MSDOS)
 # ifndef S_ISLNK
 #  define S_ISLNK(m) 0
 # endif
 # ifndef lstat
 #  define lstat stat
 # endif
-#endif /* __EMX__ */
+#endif /* __EMX__ || MSDOS */
 
 /* Reportedly, stat() macros are broken on some old systems.  Those
    systems will have to fend for themselves, as I will not introduce
diff --git a/src/test.c b/src/test.c
index 25fe8612..3acfee73 100644
--- a/src/test.c
+++ b/src/test.c
@@ -1,5 +1,5 @@
 /* Unit testing.
-   Copyright (C) 2005-2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/test.h b/src/test.h
index 7a79a929..7587177a 100644
--- a/src/test.h
+++ b/src/test.h
@@ -1,5 +1,5 @@
 /* Unit testing declarations.
-   Copyright (C) 2005-2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/url.c b/src/url.c
index d721501a..6235c521 100644
--- a/src/url.c
+++ b/src/url.c
@@ -1,5 +1,6 @@
 /* URL handling.
-   Copyright (C) 1996-2007 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -1220,7 +1221,7 @@ append_char (char ch, struct growable *dest)
 
 enum {
   filechr_not_unix    = 1,      /* unusable on Unix, / and \0 */
-  filechr_not_windows = 2,      /* unusable on Windows, one of \|/<>?:*" */
+  filechr_not_windows = 2,      /* unusable on MSDOS/Windows, one of \|/<>?:*" */
   filechr_control     = 4       /* a control character, e.g. 0-31 */
 };
 
diff --git a/src/url.h b/src/url.h
index 80e3e3c1..83f876ab 100644
--- a/src/url.h
+++ b/src/url.h
@@ -1,5 +1,6 @@
 /* Declarations for url.c.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/utils.c b/src/utils.c
index 0a222d99..94b4e3a3 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,5 +1,6 @@
 /* Various utility functions.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -287,9 +288,9 @@ datetime_str (time_t t)
 }
 
 /* The Windows versions of the following two functions are defined in
-   mswindows.c.  */
+   mswindows.c. On MSDOS this function should never be called. */
 
-#ifndef WINDOWS
+#if !defined(WINDOWS) && !defined(MSDOS)
 void
 fork_to_background (void)
 {
@@ -333,7 +334,7 @@ fork_to_background (void)
   freopen ("/dev/null", "w", stdout);
   freopen ("/dev/null", "w", stderr);
 }
-#endif /* not WINDOWS */
+#endif /* !WINDOWS && !MSDOS */
 
 /* "Touch" FILE, i.e. make its mtime ("modified time") equal the time
    specified with TM.  The atime ("access time") is set to the current
diff --git a/src/utils.h b/src/utils.h
index cb2dbbca..8f30c140 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,5 +1,6 @@
 /* Declarations for utils.c.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/wget.h b/src/wget.h
index 45b34d60..2cfa7aa8 100644
--- a/src/wget.h
+++ b/src/wget.h
@@ -1,5 +1,6 @@
 /* Miscellaneous declarations.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/xmalloc.c b/src/xmalloc.c
index c8010f2f..b003373b 100644
--- a/src/xmalloc.c
+++ b/src/xmalloc.c
@@ -1,5 +1,6 @@
 /* Wrappers around malloc and memory debugging support.
-   Copyright (C) 2003-2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation,
+   Inc.
 
 This file is part of GNU Wget.
 
diff --git a/src/xmalloc.h b/src/xmalloc.h
index ebcf4c8e..ca543caa 100644
--- a/src/xmalloc.h
+++ b/src/xmalloc.h
@@ -1,5 +1,6 @@
 /* xmalloc.c declarations.
-   Copyright (C) 2003-2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation,
+   Inc.
 
 This file is part of GNU Wget.
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7e7eff7a..1dc0f7fb 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,5 +1,6 @@
 # Makefile for `wget' utility
-# Copyright (C) 1995-2005 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+# 2004, 2005, 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
diff --git a/util/Makefile.in b/util/Makefile.in
index e275160d..a4681f4d 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for `wget' utility
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 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
diff --git a/util/dist-wget b/util/dist-wget
index 1e26366d..fd984059 100755
--- a/util/dist-wget
+++ b/util/dist-wget
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 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
diff --git a/util/rmold.pl b/util/rmold.pl
index 6d2caa85..1f574743 100755
--- a/util/rmold.pl
+++ b/util/rmold.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 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
diff --git a/windows/Makefile.doc b/windows/Makefile.doc
index 6565609f..0638d183 100644
--- a/windows/Makefile.doc
+++ b/windows/Makefile.doc
@@ -1,5 +1,5 @@
 # Makefile for `wget' utility
-# Copyright (C) 1995, 1996, 1997, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2004, 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
diff --git a/windows/Makefile.in b/windows/Makefile.in
index fa3e637f..d6b591d9 100644
--- a/windows/Makefile.in
+++ b/windows/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for `wget' utility
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 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
diff --git a/windows/Makefile.src b/windows/Makefile.src
index 1fce996e..2e49a0f0 100644
--- a/windows/Makefile.src
+++ b/windows/Makefile.src
@@ -1,5 +1,6 @@
 # Makefile for `wget' utility for MSVC
-# Copyright (C) 1995, 1996, 1997, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2004, 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
diff --git a/windows/Makefile.top b/windows/Makefile.top
index 2f546de4..8b25c5fb 100644
--- a/windows/Makefile.top
+++ b/windows/Makefile.top
@@ -1,5 +1,5 @@
 # Makefile for `Wget' utility
-# Copyright (C) 1995, 1996, 1997, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2004, 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
diff --git a/windows/Makefile.top.bor b/windows/Makefile.top.bor
index d8119464..6667a4ff 100644
--- a/windows/Makefile.top.bor
+++ b/windows/Makefile.top.bor
@@ -1,5 +1,5 @@
 # Makefile for `Wget' utility
-# Copyright (C) 1995, 1996, 1997, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2004, 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
diff --git a/windows/Makefile.top.mingw b/windows/Makefile.top.mingw
index 1b3895c0..6213116b 100644
--- a/windows/Makefile.top.mingw
+++ b/windows/Makefile.top.mingw
@@ -1,5 +1,5 @@
 # Makefile for `Wget' utility
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 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
diff --git a/windows/config-compiler.h b/windows/config-compiler.h
index acd752b4..cfef180f 100644
--- a/windows/config-compiler.h
+++ b/windows/config-compiler.h
@@ -1,5 +1,5 @@
 /* Support for various Windows compilation environments.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.