[svn] --retr-symlinks was not previously documented properly. Based on my newfound

understanding of what its limitations are, added a TODO item.  Also made a minor
tweak in html.c to silence a warning.

diff --git a/ChangeLog b/ChangeLog
index 9f4f0bd140a1ec0bb940d745ced3826aad2c47c0..ebc62d0e93e6a4b43696dd640518f07035fe73bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-09  Dan Harkless  <dan-wget@dilvish.speed.net>
+
+       * TODO: --retr-symlinks should cause wget to traverse links to dirs too.
+
 2000-09-25  Dan Harkless  <dan-wget@dilvish.speed.net>
 
        * TODO: Make wget return nonzero in situations like bad HTTP

diff --git a/TODO b/TODO
index 0606fb75467d7fe3d47c387686805177b31382a4..c60c88a172b596db84da4a0c4bc3eb1f4d675215 100644 (file)
--- a/TODO
+++ b/TODO
@@ -6,6 +6,8 @@ Wget.  Patches to implement any of these items would be gladly accepted.  The
 items are not listed in any particular order.  Not all of them represent
 user-visible changes.
 
+* --retr-symlinks should cause wget to traverse links to directories too.
+
 * Lots of noncompliant webservers issue HTTP redirects to relative URLs, and
   browsers follow them, so wget should too.
 

diff --git a/doc/ChangeLog b/doc/ChangeLog
index cfca5a712ff007fcd4c82239fe4aa7ff4762d15a..68759773e78115d4de703cac67d311f6ff49c8fd 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-09  Dan Harkless  <dan-wget@dilvish.speed.net>
+
+       * wget.texi (FTP Options): --retr-symlinks wasn't documented properly.
+
 2000-08-30  Dan Harkless  <dan-wget@dilvish.speed.net>
 
        * wget.texi (Recursive Retrieval Options): Documented new -p option.

diff --git a/doc/wget.info b/doc/wget.info
index dddc5b9c371e86b8568de05e9d135e19d581c0f6..87ff5b3c18135f85b52d928423c2ab9870b34b92 100644 (file)
--- a/doc/wget.info
+++ b/doc/wget.info
@@ -26,8 +26,8 @@ notice identical to this one.
 \1f
 Indirect:
 wget.info-1: 961
-wget.info-2: 50095
-wget.info-3: 97019
+wget.info-2: 50884
+wget.info-3: 97808
 \1f
 Tag Table:
 (Indirect)
@@ -42,47 +42,47 @@ Node: Download Options\7f12812
 Node: Directory Options\7f20659
 Node: HTTP Options\7f23137
 Node: FTP Options\7f27042
-Node: Recursive Retrieval Options\7f28235
-Node: Recursive Accept/Reject Options\7f32947
-Node: Recursive Retrieval\7f36173
-Node: Following Links\7f38471
-Node: Relative Links\7f39499
-Node: Host Checking\7f40013
-Node: Domain Acceptance\7f42038
-Node: All Hosts\7f43708
-Node: Types of Files\7f44135
-Node: Directory-Based Limits\7f46585
-Node: FTP Links\7f49225
-Node: Time-Stamping\7f50095
-Node: Time-Stamping Usage\7f51732
-Node: HTTP Time-Stamping Internals\7f53301
-Node: FTP Time-Stamping Internals\7f54771
-Node: Startup File\7f55979
-Node: Wgetrc Location\7f56852
-Node: Wgetrc Syntax\7f57667
-Node: Wgetrc Commands\7f58382
-Node: Sample Wgetrc\7f65910
-Node: Examples\7f70929
-Node: Simple Usage\7f71536
-Node: Advanced Usage\7f73930
-Node: Guru Usage\7f76681
-Node: Various\7f78343
-Node: Proxies\7f78867
-Node: Distribution\7f81632
-Node: Mailing List\7f81983
-Node: Reporting Bugs\7f82682
-Node: Portability\7f84467
-Node: Signals\7f85842
-Node: Appendices\7f86496
-Node: Robots\7f86911
-Node: Introduction to RES\7f88058
-Node: RES Format\7f89951
-Node: User-Agent Field\7f91055
-Node: Disallow Field\7f91819
-Node: Norobots Examples\7f92430
-Node: Security Considerations\7f93384
-Node: Contributors\7f94380
-Node: Copying\7f97019
-Node: Concept Index\7f116182
+Node: Recursive Retrieval Options\7f29024
+Node: Recursive Accept/Reject Options\7f33736
+Node: Recursive Retrieval\7f36962
+Node: Following Links\7f39260
+Node: Relative Links\7f40288
+Node: Host Checking\7f40802
+Node: Domain Acceptance\7f42827
+Node: All Hosts\7f44497
+Node: Types of Files\7f44924
+Node: Directory-Based Limits\7f47374
+Node: FTP Links\7f50014
+Node: Time-Stamping\7f50884
+Node: Time-Stamping Usage\7f52521
+Node: HTTP Time-Stamping Internals\7f54090
+Node: FTP Time-Stamping Internals\7f55560
+Node: Startup File\7f56768
+Node: Wgetrc Location\7f57641
+Node: Wgetrc Syntax\7f58456
+Node: Wgetrc Commands\7f59171
+Node: Sample Wgetrc\7f66699
+Node: Examples\7f71718
+Node: Simple Usage\7f72325
+Node: Advanced Usage\7f74719
+Node: Guru Usage\7f77470
+Node: Various\7f79132
+Node: Proxies\7f79656
+Node: Distribution\7f82421
+Node: Mailing List\7f82772
+Node: Reporting Bugs\7f83471
+Node: Portability\7f85256
+Node: Signals\7f86631
+Node: Appendices\7f87285
+Node: Robots\7f87700
+Node: Introduction to RES\7f88847
+Node: RES Format\7f90740
+Node: User-Agent Field\7f91844
+Node: Disallow Field\7f92608
+Node: Norobots Examples\7f93219
+Node: Security Considerations\7f94173
+Node: Contributors\7f95169
+Node: Copying\7f97808
+Node: Concept Index\7f116971
 \1f
 End Tag Table

diff --git a/doc/wget.info-1 b/doc/wget.info-1
index 884f2adda3801e51868e2f46573d2cdb84d213bb..aa782849b600f25866b9ef51d70bdb7e4ddfab55 100644 (file)
--- a/doc/wget.info-1
+++ b/doc/wget.info-1
@@ -681,8 +681,23 @@ FTP Options
 ===========
 
 `--retr-symlinks'
-     Retrieve symbolic links on FTP sites as if they were plain files,
-     i.e. don't just create links locally.
+     Usually, when retrieving FTP directories recursively and a symbolic
+     link is encountered, the linked-to file is not downloaded.
+     Instead, a matching symbolic link is created on the local
+     filesystem.  The pointed-to file will not be downloaded unless
+     this recursive retrieval would have encountered it separately and
+     downloaded it anyway.
+
+     When `--retr-symlinks' is specified, however, symbolic links are
+     traversed and the pointed-to files are retrieved.  At this time,
+     this option does not cause wget to traverse symlinks to
+     directories and recurse through them, but in the future it should
+     be enhanced to do this.
+
+     Note that when retrieving a file (not a directory) because it was
+     specified on the commandline, rather than because it was recursed
+     to, this option has no effect.  Symbolic links are always
+     traversed in this case.
 
 `-g on/off'
 `--glob=on/off'

diff --git a/doc/wget.info-3 b/doc/wget.info-3
index cad3e7b69bcfad8e9b4c268d6f3d2e67f02c4d4e..e73c05e5d32fe4aea6ef0fc0970dae2e38639ba0 100644 (file)
--- a/doc/wget.info-3
+++ b/doc/wget.info-3
@@ -479,8 +479,8 @@ Concept Index
 * pause:                                 Download Options.
 * portability:                           Portability.
 * proxies:                               Proxies.
-* proxy <1>:                             Download Options.
-* proxy:                                 HTTP Options.
+* proxy <1>:                             HTTP Options.
+* proxy:                                 Download Options.
 * proxy authentication:                  HTTP Options.
 * proxy filling:                         Recursive Retrieval Options.
 * proxy password:                        HTTP Options.
@@ -500,7 +500,6 @@ Concept Index
 * retries:                               Download Options.
 * retries, waiting between:              Download Options.
 * retrieval tracing style:               Download Options.
-* retrieve symbolic links:               FTP Options.
 * retrieving:                            Recursive Retrieval.
 * robots:                                Robots.
 * robots.txt:                            Robots.
@@ -516,6 +515,7 @@ Concept Index
 * startup file:                          Startup File.
 * suffixes, accept:                      Types of Files.
 * suffixes, reject:                      Types of Files.
+* symbolic links, retrieving:            FTP Options.
 * syntax of options:                     Option Syntax.
 * syntax of wgetrc:                      Wgetrc Syntax.
 * tag-based recursive pruning:           Recursive Accept/Reject Options.

diff --git a/doc/wget.texi b/doc/wget.texi
index b23b13e27ef1c55456f4774003baeb691dd9cb82..c61e0c7b7c8f642674814de2d60db2ffb833484f 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -818,10 +818,24 @@ Wget as Mozilla.
 @section FTP Options
 
 @table @samp
-@cindex retrieve symbolic links
+@cindex symbolic links, retrieving
 @item --retr-symlinks
-Retrieve symbolic links on @sc{ftp} sites as if they were plain files,
-i.e. don't just create links locally.
+Usually, when retrieving @sc{ftp} directories recursively and a symbolic
+link is encountered, the linked-to file is not downloaded.  Instead, a
+matching symbolic link is created on the local filesystem.  The
+pointed-to file will not be downloaded unless this recursive retrieval
+would have encountered it separately and downloaded it anyway.
+
+When @samp{--retr-symlinks} is specified, however, symbolic links are
+traversed and the pointed-to files are retrieved.  At this time, this
+option does not cause wget to traverse symlinks to directories and
+recurse through them, but in the future it should be enhanced to do
+this.
+
+Note that when retrieving a file (not a directory) because it was
+specified on the commandline, rather than because it was recursed to,
+this option has no effect.  Symbolic links are always traversed in this
+case.
 
 @cindex globbing, toggle
 @item -g on/off

diff --git a/po/cs.gmo b/po/cs.gmo
index 65d031bd08ddd86606f9d33cf1738dbe60d39dec..7d4f9d3284573d5729248210fe9335a41e2c0068 100644 (file)
Binary files a/po/cs.gmo and b/po/cs.gmo differ

diff --git a/po/cs.po b/po/cs.po
index 51b643a443d30e4d37b2c861388f951b2707df18..acfd688ad5d44e94a788d176663a3ed6229a71a1 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU wget 1.5.2-b1\n"
-"POT-Creation-Date: 2000-08-30 03:32-0700\n"
+"POT-Creation-Date: 2000-10-09 15:38-0700\n"
 "PO-Revision-Date: 1998-06-05 08:47\n"
 "Last-Translator: Jan Prikryl <prikryl@acm.org>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -840,9 +840,11 @@ msgstr ""
 
 # , fuzzy
 #: src/main.c:172
+#, fuzzy
 msgid ""
 "FTP options:\n"
-"       --retr-symlinks   retrieve FTP symbolic links.\n"
+"       --retr-symlinks   when recursing, retrieve linked-to files (not "
+"dirs).\n"
 "  -g,  --glob=on/off     turn file name globbing on or off.\n"
 "       --passive-ftp     use the \"passive\" transfer mode.\n"
 "\n"

diff --git a/po/de.gmo b/po/de.gmo
index d7a899a159419070889179ab93376c2ae5a111e3..10f1322fb8400f8083c69468fdaaca0747c63e55 100644 (file)
Binary files a/po/de.gmo and b/po/de.gmo differ

diff --git a/po/de.po b/po/de.po
index ec197feef72c578789fc9ff701b0d2eb9692899d..4bf4f24a7d5c8d9e671f3692765f25ffc879a13f 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -23,7 +23,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wget 1.5.2-b4\n"
-"POT-Creation-Date: 2000-08-30 03:32-0700\n"
+"POT-Creation-Date: 2000-10-09 15:38-0700\n"
 "PO-Revision-Date: 1998-06-15 19:25+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -788,9 +788,11 @@ msgstr ""
 "\n"
 
 #: src/main.c:172
+#, fuzzy
 msgid ""
 "FTP options:\n"
-"       --retr-symlinks   retrieve FTP symbolic links.\n"
+"       --retr-symlinks   when recursing, retrieve linked-to files (not "
+"dirs).\n"
 "  -g,  --glob=on/off     turn file name globbing on or off.\n"
 "       --passive-ftp     use the \"passive\" transfer mode.\n"
 "\n"

diff --git a/po/hr.gmo b/po/hr.gmo
index 672b81ee19cf96885b78f63557c08ce88464e925..7adb0d9ce5841b6664a232ea7af64bdb8838e9de 100644 (file)
Binary files a/po/hr.gmo and b/po/hr.gmo differ

diff --git a/po/hr.po b/po/hr.po
index e3a28b3b1abfc56e505ebdeb40816a9d07e7cb1b..d7ccb1fbab29e8e9b8eda21bfe78a52b19f48651 100644 (file)
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wget 1.5.2-b2\n"
-"POT-Creation-Date: 2000-08-30 03:32-0700\n"
+"POT-Creation-Date: 2000-10-09 15:38-0700\n"
 "PO-Revision-Date: 1998-02-29 21:05+01:00\n"
 "Last-Translator: Hrvoje Niksic <hniksic@srce.hr>\n"
 "Language-Team: Croatian <hr-translation@bagan.srce.hr>\n"
@@ -758,9 +758,11 @@ msgstr ""
 "\n"
 
 #: src/main.c:172
+#, fuzzy
 msgid ""
 "FTP options:\n"
-"       --retr-symlinks   retrieve FTP symbolic links.\n"
+"       --retr-symlinks   when recursing, retrieve linked-to files (not "
+"dirs).\n"
 "  -g,  --glob=on/off     turn file name globbing on or off.\n"
 "       --passive-ftp     use the \"passive\" transfer mode.\n"
 "\n"

diff --git a/po/it.gmo b/po/it.gmo
index 6d6c0d4b6eb291ea554c0337470a7b0a4ee104e0..ff73e1ec69e3fabbb6ee03575c9e4c68547ecb91 100644 (file)
Binary files a/po/it.gmo and b/po/it.gmo differ

diff --git a/po/it.po b/po/it.po
index 6beef9110b7ed222a232c58ee230d1c1de8c605c..f6366b80a796ef484a300b9aa77b03b284bb9d5d 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wget 1.5.2-b1\n"
-"POT-Creation-Date: 2000-08-30 03:32-0700\n"
+"POT-Creation-Date: 2000-10-09 15:38-0700\n"
 "PO-Revision-Date: 1998-06-13 15:22+02:00\n"
 "Last-Translator: Giovanni Bortolozzo <borto@dei.unipd.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -769,9 +769,11 @@ msgstr ""
 "\n"
 
 #: src/main.c:172
+#, fuzzy
 msgid ""
 "FTP options:\n"
-"       --retr-symlinks   retrieve FTP symbolic links.\n"
+"       --retr-symlinks   when recursing, retrieve linked-to files (not "
+"dirs).\n"
 "  -g,  --glob=on/off     turn file name globbing on or off.\n"
 "       --passive-ftp     use the \"passive\" transfer mode.\n"
 "\n"

diff --git a/po/no.gmo b/po/no.gmo
index e5ed1450eab7e92dd74933bc3154625c83125a82..94ab87e10c5d4eb84a068b393b5a377d9cc392db 100644 (file)
Binary files a/po/no.gmo and b/po/no.gmo differ

diff --git a/po/no.po b/po/no.po
index 1fb8c4144ec192f50dc7b693adcab710178ba719..d764b20e13dbfdf01fddee1a7fbd640826d7e73a 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wget 1.5.2-b1\n"
-"POT-Creation-Date: 2000-08-30 03:32-0700\n"
+"POT-Creation-Date: 2000-10-09 15:38-0700\n"
 "PO-Revision-Date: 1998-05-22 09:00+0100\n"
 "Last-Translator: Robert Schmidt <rsc@vingmed.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -759,9 +759,11 @@ msgstr ""
 "\n"
 
 #: src/main.c:172
+#, fuzzy
 msgid ""
 "FTP options:\n"
-"       --retr-symlinks   retrieve FTP symbolic links.\n"
+"       --retr-symlinks   when recursing, retrieve linked-to files (not "
+"dirs).\n"
 "  -g,  --glob=on/off     turn file name globbing on or off.\n"
 "       --passive-ftp     use the \"passive\" transfer mode.\n"
 "\n"

diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index eb3c54c1eded658f715604b0956eafc349351c80..22f85b53279dc3f830f1c4647d023d784188f6c7 100644 (file)
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ

diff --git a/po/pt_BR.po b/po/pt_BR.po
index b6f20a09712a10fbec5cedd6f25e13ef9ac6ec5d..59a90f6ce570f861a684018000b6dc020bbd0786 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wget 1.5-b9\n"
-"POT-Creation-Date: 2000-08-30 03:32-0700\n"
+"POT-Creation-Date: 2000-10-09 15:38-0700\n"
 "PO-Revision-Date: 1998-04-06 22:09-0300\n"
 "Last-Translator: Wanderlei Antonio Cavasin <cavassin@conectiva.com.br>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -828,9 +828,11 @@ msgstr ""
 
 # , fuzzy
 #: src/main.c:172
+#, fuzzy
 msgid ""
 "FTP options:\n"
-"       --retr-symlinks   retrieve FTP symbolic links.\n"
+"       --retr-symlinks   when recursing, retrieve linked-to files (not "
+"dirs).\n"
 "  -g,  --glob=on/off     turn file name globbing on or off.\n"
 "       --passive-ftp     use the \"passive\" transfer mode.\n"
 "\n"

diff --git a/po/wget.pot b/po/wget.pot
index c3590d1bc0c214e79783ec983c350d5692313cf3..7bcea84ce42b8d7051e08666c0455379b5135f8f 100644 (file)
--- a/po/wget.pot
+++ b/po/wget.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-30 03:32-0700\n"
+"POT-Creation-Date: 2000-10-09 15:38-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -686,7 +686,8 @@ msgstr ""
 #: src/main.c:172
 msgid ""
 "FTP options:\n"
-"       --retr-symlinks   retrieve FTP symbolic links.\n"
+"       --retr-symlinks   when recursing, retrieve linked-to files (not "
+"dirs).\n"
 "  -g,  --glob=on/off     turn file name globbing on or off.\n"
 "       --passive-ftp     use the \"passive\" transfer mode.\n"
 "\n"

diff --git a/src/ChangeLog b/src/ChangeLog
index 709174ef6ca5ba4b6ef53623f0ad6cc018a405df..b4129802207c38c9344289720f2292cfde6cf719 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-09  Dan Harkless  <dan-wget@dilvish.speed.net>
+
+       * html.c (htmlfindurl): Added unneeded initialization to quiet warning.
+               
+       * main.c (print_help): Clarified what --retr-symlinks does.
+       
 2000-08-30  Dan Harkless  <dan-wget@dilvish.speed.net>
 
        * ftp.c (ftp_retrieve_list): Use new INFINITE_RECURSION #define.

diff --git a/src/html.c b/src/html.c
index 426e733059d6a99bb5e16ab52e84fb53fb071598..b5327ca315a68a927b29c0354b41e814e2252e67 100644 (file)
--- a/src/html.c
+++ b/src/html.c
@@ -145,7 +145,7 @@ htmlfindurl (const char *buf, int bufsize, int *size, int init,
     {
       const char*  link_href = NULL;
       const char*  link_rel = NULL;
-      int          link_href_saved_size;
+      int          link_href_saved_size = 0; /* init. just to shut up warning */
 
       if (!bufsize)
        break;

diff --git a/src/main.c b/src/main.c
index 42d4047c97dfde495c4640a2d3c617eaf5c92b26..7937ff63ae480deadbdf13ff3cbb13a1538a967d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -171,7 +171,7 @@ HTTP options:\n\
   -U,  --user-agent=AGENT    identify as AGENT instead of Wget/VERSION.\n\
 \n"), _("\
 FTP options:\n\
-       --retr-symlinks   retrieve FTP symbolic links.\n\
+       --retr-symlinks   when recursing, retrieve linked-to files (not dirs).\n\
   -g,  --glob=on/off     turn file name globbing on or off.\n\
        --passive-ftp     use the \"passive\" transfer mode.\n\
 \n"), _("\