Merging ABOUT-NLS modification in to reinstate ABOUT-NLS.

diff --git a/ChangeLog b/ChangeLog
index 81061a049c19bbfb114e09714d276fcaafb1c4da..4b26494faf5135cc7f4eb414d9ed056ae8885b15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-14  Micah Cowan  <micah@cowan.name>
+
+       * ABOUT-NLS: Removed.
+
 2008-02-10  Micah Cowan  <micah@cowan.name>
 
        * NEWS: Added note re interrupted files resulting in renames,

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 509828cc6acb2983608adf9ed2969d3766d7a73f..2f25f5a8085313fe56aaa9433953db97c22d1322 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-17  Micah Cowan  <micah@cowan.name>
+
+       * wget.texi <Directory-Based Limits>: Mention importance of
+       trailing slashes to --no-parents.
+
 2008-02-10  Micah Cowan  <micah@cowan.name>
 
        * wget.texi <HTTP Options>: Added documentation of

diff --git a/doc/wget.texi b/doc/wget.texi
index 008e1809e438a711024b4dad0fd9eae65b204821..a440794904495772fe956f72f40a559c939ab7e5 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -2202,6 +2202,14 @@ followed.  Only the archive you are interested in will be downloaded.
 Essentially, @samp{--no-parent} is similar to
 @samp{-I/~luzer/my-archive}, only it handles redirections in a more
 intelligent fashion.
+
+@strong{Note} that, for HTTP (and HTTPS), the trailing slash is very
+important to @samp{--no-parent}. HTTP has no concept of a ``directory''---Wget
+relies on you to indicate what's a directory and what isn't. In
+@samp{http://foo/bar/}, Wget will consider @samp{bar} to be a
+directory, while in @samp{http://foo/bar} (no trailing slash),
+@samp{bar} will be considered a filename (so @samp{--no-parent} would be
+meaningless, as its parent is @samp{/}).
 @end table
 
 @node Relative Links

diff --git a/src/ChangeLog b/src/ChangeLog
index c78ee268afe325f1d60d84ed9ced3c3dcc2434f4..c6159ca353a0e4edd8085d7cadb2513180351182 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-19  Micah Cowan  <micah@cowan.name>
+
+       * utils.c (test_dir_matches_p): More tests related for
+       dir_matches_p.
+
+2008-03-17  Micah Cowan  <micah@cowan.name>
+
+       * connect.c: Include sys/time.h to support use of the select
+       function on older systems.
+
 2008-02-11  Benno Schulenberg  <bensberg@justemail.net>
 
        * http.c: More accurate and descriptive messages for when a file

diff --git a/src/connect.c b/src/connect.c
index e4ad453b1658806eb37df21c72c8ec4d7306db26..2be764d41c2356f0302eafd41fadd8153c386ceb 100644 (file)
--- a/src/connect.c
+++ b/src/connect.c
@@ -51,6 +51,9 @@ as that of the covered work.  */
 #ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
 #endif /* HAVE_SYS_SELECT_H */
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
 #include "utils.h"
 #include "host.h"
 #include "connect.h"

diff --git a/src/utils.c b/src/utils.c
index 920f3b54482f0232c4a26b62e988e19a516686e2..8c56d4dbf5772ae3f9dbf4e91c5f47960c35dd0c 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -2175,7 +2175,15 @@ test_dir_matches_p()
     { { "/somedir", "/someotherdir", NULL }, "anotherdir", false },
     { { "/somedir", "/*otherdir", NULL }, "anotherdir", true },
     { { "/somedir/d1", "/someotherdir", NULL }, "somedir/d1", true },
+    { { "*/*d1", "/someotherdir", NULL }, "somedir/d1", true },
     { { "/somedir/d1", "/someotherdir", NULL }, "d1", false },
+    { { "!COMPLETE", NULL, NULL }, "!COMPLETE", true },
+    { { "*COMPLETE", NULL, NULL }, "!COMPLETE", true },
+    { { "*/!COMPLETE", NULL, NULL }, "foo/!COMPLETE", true },
+    { { "*COMPLETE", NULL, NULL }, "foo/!COMPLETE", false },
+    { { "*/*COMPLETE", NULL, NULL }, "foo/!COMPLETE", true },
+    { { "/dir with spaces", NULL, NULL }, "dir with spaces", true },
+    { { "/dir*with*spaces", NULL, NULL }, "dir with spaces", true },
   };
   
   for (i = 0; i < countof(test_array); ++i)