From: Micah Cowan <micah@cowan.name>
Date: Mon, 15 Oct 2007 05:41:29 +0000 (-0700)
Subject: --spider or --delete-after implies --no-directories.
X-Git-Tag: v1.13~507
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=d905504a0af1f808ead87bf6877dafaf6ff6aef8

--spider or --delete-after implies --no-directories.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 9cd4d003..8b9c65b4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,13 +1,3 @@
-2007-10-14  Micah Cowan  <micah@cowan.name>
-
-	* recur.c (download_child_p): Print error if unlink of
-	robots.txt fails.
-
-2007-10-14  Joshua David Williams  <yurimxpxman@gmail.com>
-
-	* recur.c (download_child_p): Remove robots.txt if
-	--delete-after or --spider is on.
-
 2007-10-14  Micah Cowan  <micah@cowan.name>
 
 	* cmpt.c, cookies.c, ftp-basic.c, ftp-ls.c, ftp.c, hash.c,
@@ -17,6 +7,15 @@
 	* 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  <yurimxpxman@gmail.com>
+
+	* recur.c (download_child_p): Remove robots.txt if
+	--delete-after or --spider is on.
 
 2007-10-13  Micah Cowan  <micah@cowan.name>
 
diff --git a/src/main.c b/src/main.c
index fb07c1a4..4c1a70e2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -832,7 +832,10 @@ main (int argc, char *const *argv)
      interoption dependency checks. */
 
   if (opt.reclevel == 0)
-    opt.reclevel = INFINITE_RECURSION; /* see recur.h for commentary on this */
+      opt.reclevel = INFINITE_RECURSION; /* see recur.h for commentary */
+
+  if (opt.spider || opt.delete_after)
+      opt.no_dirstruct = true;
 
   if (opt.page_requisites && !opt.recursive)
     {