# HG changeset patch
# User Martin Panter <vadmium `a gmail.com>
# Date 1240741093 0
# Branch trunk
# Node ID 49dced1d2e1667cfe1f99112a0091ff2db68a366
# Parent  dfcf5d9243218fb557cb03e7abafd6d89e858e4d
On Windows, don't use symlinks, and do compile mswindows.c.

diff -r dfcf5d924321 -r 49dced1d2e16 src/ChangeLog
--- a/src/ChangeLog	Sun Apr 26 09:41:47 2009 +0000
+++ b/src/ChangeLog	Sun Apr 26 10:18:13 2009 +0000
@@ -1,3 +1,9 @@
+2009-04-26  Martin Panter  <vadmium `a gmail.com>
+
+	* ftp.c (ftp_retrieve_list): Don't use symlinks on Windows despite
+	what Autotools says.
+	* Makefile.in: Compile mswindows.c when WINDOWS defined.
+
 2008-06-29  Micah Cowan  <address@hidden>
 
 	* version.c: Bumped version to 1.11.4.
diff -r dfcf5d924321 -r 49dced1d2e16 src/Makefile.in
--- a/src/Makefile.in	Sun Apr 26 09:41:47 2009 +0000
+++ b/src/Makefile.in	Sun Apr 26 10:18:13 2009 +0000
@@ -80,6 +80,10 @@
       res.o retr.o safe-ctype.o snprintf.o spider.o $(SSL_OBJ)    \
       url.o utils.o version.o xmalloc.o
 
+ifdef WINDOWS
+    OBJ += mswindows.o
+endif
+
 .SUFFIXES:
 .SUFFIXES: .c .o
 
diff -r dfcf5d924321 -r 49dced1d2e16 src/ftp.c
--- a/src/ftp.c	Sun Apr 26 09:41:47 2009 +0000
+++ b/src/ftp.c	Sun Apr 26 10:18:13 2009 +0000
@@ -1468,7 +1468,7 @@
              follow them.  */
           if (!opt.retr_symlinks)
             {
-#ifdef HAVE_SYMLINK
+#if defined HAVE_SYMLINK && !defined WINDOWS
               if (!f->linkto)
                 logputs (LOG_NOTQUIET,
                          _("Invalid name of the symlink, skipping.\n"));
@@ -1504,11 +1504,11 @@
                     logprintf (LOG_NOTQUIET, "symlink: %s\n", strerror (errno));
                   logputs (LOG_VERBOSE, "\n");
                 } /* have f->linkto */
-#else  /* not HAVE_SYMLINK */
+#else  /* !HAVE_SYMLINK || WINDOWS */
               logprintf (LOG_NOTQUIET,
                          _("Symlinks not supported, skipping symlink `%s'.\n"),
                          con->target);
-#endif /* not HAVE_SYMLINK */
+#endif /* HAVE_SYMLINK && !WINDOWS */
             }
           else                /* opt.retr_symlinks */
             {