From: Micah Cowan Date: Fri, 16 May 2008 02:13:08 +0000 (-0700) Subject: Merge quote module stuff with current mainline. X-Git-Tag: v1.13~421^2~12^2~28 X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=e72b57629bf49cdfd663002a8bb336a67b958979 Merge quote module stuff with current mainline. --- e72b57629bf49cdfd663002a8bb336a67b958979 diff --cc ChangeLog index 166fd30e,f5b5d371..a0a295d8 --- a/ChangeLog +++ b/ChangeLog @@@ -1,11 -1,21 +1,29 @@@ +2008-05-12 Micah Cowan + + * NEWS: Translations and -N/-O. + +2008-04-30 Micah Cowan + + * NEWS: Added documentation for changes made in 1.11.2. + + 2008-04-14 Micah Cowan + + * GNUmakefile, lib/Makefile.am, lib/error.c, lib/error.h, + lib/exitfail.c, lib/exitfail.h, lib/getopt.c, lib/intprops.h, + lib/quote.c, lib/quote.h, lib/quotearg.c, lib/quotearg.h, + lib/stdlib.in.h, lib/strerror.c, lib/string.in.h, + lib/unistd.in.h, lib/wchar.in.h, lib/wctype.in.h, + lib/xalloc-die.c, lib/xalloc.h, lib/xmalloc.c, m4/error.m4, + m4/exitfail.m4, m4/extensions.m4, m4/gnulib-cache.m4, + m4/gnulib-comp.m4, m4/include_next.m4, m4/inline.m4, + m4/mbrtowc.m4, m4/mbstate_t.m4, m4/quote.m4, m4/quotearg.m4, + m4/stdlib_h.m4, m4/strerror.m4, m4/string_h.m4, m4/unistd_h.m4, + m4/wchar.m4, m4/wctype.m4, m4/wint_t.m4, m4/xalloc.m4, + md5/Makefile.am, md5/m4/gnulib-cache.m4, md5/m4/gnulib-comp.m4, + md5/m4/include_next.m4, md5/m4/md5.m4, md5/m4/stdint.m4, + md5/md5.c, md5/md5.h, md5/stdint.in.h, md5/wchar.in.h: Update + from Gnulib, and add the "quote" module. + 2008-03-20 Micah Cowan * ABOUT-NLS: Reinstated, but with a message mentioning that diff --cc NEWS index 6b90b790,b87f9d98..24a097c4 --- a/NEWS +++ b/NEWS @@@ -6,40 -6,12 +6,33 @@@ See the end for copying conditions Please send GNU Wget bug reports to . -* Changes in Wget (MAINLINE). +* Changes in Wget 1.11.3 -** Gnulib is now used to provide code for certain portability aspects in -GNU Wget. +** Downgraded -N with -O to a warning, rather than an error. -** Wget uses Automake now as part of its build infrastructure. +** Translation updates + - * Changes in Wget (MAINLINE). - - ** Gnulib is now used to provide code for certain portability aspects in - GNU Wget. - - ** Wget uses Automake now as part of its build infrastructure. - +* Changes in Wget 1.11.2 + +** Fixed a problem in authenticating over HTTPS through a proxy. +(Regression in 1.11 over 1.10.2.) + +** The combination of -r or -p with -O, which was disallowed in 1.11, +has been downgraded to a warning in 1.11.2. (-O and -N, which was never +meaningful, is still an error.) + +** Further improvements to progress bar displays in non-English locales +(too many spaces could be inserted, causing the display to scroll). + +** Successive invocations of Wget on FTP URLS, with --no-remove-listing +and --continue, was causing Wget to append, rather than replace, +information in the .listing file, and thereby download the same files +multiple times. This has been fixed in 1.11.2. + +** Wget 1.11 no longer allowed ".." to persist at the beginning of URLs, +for improved conformance with RFC 3986. However, this behavior presents +problems for some FTP setups, and so they are now preserved again, for +FTP URLs only. * Changes in Wget 1.11.1. diff --cc src/ChangeLog index b8b466c0,c2db9da9..f223d359 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,82 -1,37 +1,116 @@@ + 2008-05-14 Micah Cowan + + * ftp.c (ftp_retrieve_list): Symlinks and other filenames + should be fully quoted. + +2008-05-12 Micah Cowan + + * main.c (main): Downgrade "-N with -O" to a warning, and switch + it off to avoid confusing messages. + +2008-04-30 Micah Cowan + + * progress.c (create_image): Fix glitch where too many spaces are + printed on lines that don't display the ETA, in multibyte + locales. + +2008-04-27 Rabin Vincent + + * http.c (http_loop): Fix return for the case where we don't + download a file because of -nc. + +2008-04-27 Micah Cowan + + * url.c (path_simplify): Go back to allowing leading ".." in + paths, but only for FTP URLs. + (test_path_simplify): Add scheme-specificness to tests, adapt for + mu_run_test. + + * test.c (all_tests): Add test_path_simplify. + + * main.c (main): Downgrade -r, -p with -O to a warning rather than + an error; elaborate just a bit more for other -O combination + cases. + +2008-04-26 Micah Cowan + + * http.c (gethttp): Move proxy CONNECT handling to below the + retry_with_auth label, to deal with properly reconnecting to + proxies when we need to authenticate. + +2008-04-25 Micah Cowan + + * Makefile.am: -I foo -> -Ifoo. + +2008-04-23 Micah Cowan + + * utils.c (test_dir_matches_p): Added a test for the case + described in issue #20518. + +2008-04-22 Jim Paris + + * openssl.c (ssl_init): Enable combined certificate/key in + single file (apparent regression from ~1.9). Resolves issue + #22767. + +2008-04-22 Steven Schubiger + + * http.c (print_response_line): Changed to make responses always + be logged, even in --quiet mode, if --server-response was + specified. This is to bring http.c's handling of the situation + in line with ftp.c's. + +2008-04-22 Pranab Shenoy + + * init.c: Added test_commands_sorted unit test to check is + commands are sorted. Fixes bug #21245. + + * test.c: Added test_commands_sorted to the test suite. + +2008-04-22 Rabin Vincent + + * ftp.c (ftp_get_listing): Only remove .listing if it has been + created. + +2008-04-22 Alain Guibert + + * test.h (mu_run_test): Move declaration before statements, for + C90 conformance. Fixes bug #22789. + +2008-04-22 Mike Frysinger + + * Makefile.am: Move @LIBS@ after other libraries, for better + static-linking support. Fixes bug #22143. + + 2008-04-16 Steven Schubiger + + * ftp.c: Use Gnulib's quote function for printing filenames and + such. + * connect.c: Likewise. + * convert.c: Likewise. + * cookies.c: Likewise. + * ftp-opie.c: Likewise. + * gnutls.c: Likewise. + * init.c: Likewise. + * log.c: Likewise. + * mswindows.c: Likewise. + * openssl.c: Likewise. + * progress.c: Likewise. + * recur.c: Likewise. + * res.c: Likewise. + * utils.c: Likewise. + + 2008-04-16 Steven Schubiger + + * sysdep.h: Comment the defines __EXTENSIONS__ and _GNU_SOURCE + out, because they're now defined independently by config.h. + + 2008-04-14 Steven Schubiger + + * http.c: Use Gnulib's quote function for printing filenames and + such. + * wget.h: #include "quote.h". + 2008-04-12 Rabin Vincent * mswindows.c (fake_fork_child): Don't create a logfile for diff --cc src/Makefile.am index d91ee764,4b351204..45175491 --- a/src/Makefile.am +++ b/src/Makefile.am @@@ -44,11 -44,11 +44,11 @@@ wget_SOURCES = cmpt.c connect.c convert ftp.h gen-md5.h hash.h host.h html-parse.h \ http.h http-ntlm.h init.h log.h mswindows.h netrc.h \ options.h progress.h ptimer.h recur.h res.h retr.h \ - spider.h ssl.h sysdep.h url.h utils.h wget.h xmalloc.h + spider.h ssl.h sysdep.h url.h utils.h wget.h nodist_wget_SOURCES = version.c EXTRA_wget_SOURCES = mswindows.c - LDADD = $(ALLOCA) $(LIBOBJS) ../lib/libgnu.a @MD5_LDADD@ + LDADD = $(LIBOBJS) ../lib/libgnu.a @MD5_LDADD@ -AM_CPPFLAGS = -I $(top_srcdir)/lib @MD5_CPPFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/lib @MD5_CPPFLAGS@ version.c: $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am echo 'const char *version_string = "@VERSION@"' > $@ diff --cc src/ftp.c index 5a9ecc6a,59ba1c16..0ecc6bcb --- a/src/ftp.c +++ b/src/ftp.c @@@ -1325,18 -1330,16 +1330,18 @@@ ftp_get_listing (struct url *u, ccon *c con->target = old_target; if (err == RETROK) - *f = ftp_parse_ls (lf, con->rs); - else - *f = NULL; - if (opt.remove_listing) { - if (unlink (lf)) - logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno)); - else - logprintf (LOG_VERBOSE, _("Removed %s.\n"), quote (lf)); + *f = ftp_parse_ls (lf, con->rs); + if (opt.remove_listing) + { + if (unlink (lf)) + logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno)); + else - logprintf (LOG_VERBOSE, _("Removed `%s'.\n"), lf); ++ logprintf (LOG_VERBOSE, _("Removed %s.\n"), quote (lf)); + } } + else + *f = NULL; xfree (lf); con->cmd &= ~DO_LIST; return err; diff --cc src/http.c index 129359ca,5b04fe4a..0252d342 --- a/src/http.c +++ b/src/http.c @@@ -810,7 -810,8 +810,8 @@@ print_response_line(const char *prefix { char *copy; BOUNDED_TO_ALLOCA(b, e, copy); - logprintf (LOG_ALWAYS, "%s%s\n", prefix, escnonprint(copy)); - logprintf (LOG_VERBOSE, "%s%s\n", prefix, ++ logprintf (LOG_ALWAYS, "%s%s\n", prefix, + quotearg_style (escape_quoting_style, copy)); } /* Print the server response, line by line, omitting the trailing CRLF