From: Micah Cowan Date: Fri, 11 Jul 2008 23:30:51 +0000 (-0700) Subject: Merge current tip with CSS stuff. X-Git-Tag: v1.13~421 X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=2e2ac6ad2fc90eaf46ae5fee0bc4f61dd97b4284 Merge current tip with CSS stuff. --- 2e2ac6ad2fc90eaf46ae5fee0bc4f61dd97b4284 diff --cc .hgignore index 58932bb0,d5895afe..0b6a441f --- a/.hgignore +++ b/.hgignore @@@ -28,11 -36,8 +36,9 @@@ src/.dep src/stamp-h1 src/config.h src/config.h.in +src/css.c src/wget src/cscope.out - src/tags - src/TAGS src/libunittest.a src/version.c doc/stamp-vti diff --cc ChangeLog index 4cd9a161,00a1bfe7..d96ce355 --- a/ChangeLog +++ b/ChangeLog @@@ -1,16 -1,75 +1,88 @@@ + 2008-06-30 Micah Cowan + + * NEWS: Entries for 1.11.4. + + * AUTHORS: Added Steven Schubiger. + + 2008-05-29 Micah Cowan + + * po/*.po: Updated from TP (the 1.11.3 set). + + * po/POTFILES.in: Added some more files from lib/, remove + src/xmalloc.c. + + * po/quot.sed, po/boldquot.sed: Automatic handling of quotearg's ` + and '. + + 2008-05-15 Micah Cowan + + * NEWS: Entry for --ask-password. + + 2008-05-14 Joao Ferreira + + * src/main.c, src/http.c, src/ftp.c: -nc is now working in + conjunction with '-O file'. + + 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-30 Steven Schubiger + + * lib/getdelim.c, lib/getline.c, lib/getpass.c, + lib/getpass.h, lib/realloc.c, lib/stdio.h, + lib/stdio.in.h, lib/stdlib.h, lib/stdlib.in.h: Imported + from gnulib. + * m4/eoverflow.m4, m4/extensions.m4, m4/getdelim.m4, + m4/getline.m4, m4/getpass.m4, m4/malloc.m4, m4/realloc.m4, + m4/stdio_h.m4, m4/stdlib_h.m4: Imported from gnulib. + * md5/stdint.h: Imported from gnulib. + + * GNUmakefile: Updated from gnulib. + * lib/Makefile.am, lib/getopt.c, lib/unistd.in.h: Updated + from gnulib. + * m4/gnulib-cache.m4, m4/gnulib-common.m4, m4/gnulib-comp.m4, + m4/include_next.m4, m4/unistd_h.m4: Updated from gnulib. + * md5/Makefile.am, md5/m4/gnulib-cache.m4, md5/m4/gnulib-common.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: Updated from gnulib. + +2008-04-24 Micah Cowan + + * NEWS: Removed info about move to Automake, Gnulib. Added item + about the addition of CSS support. + +2008-04-22 Micah Cowan + + * ylwrap: Added via automake -ac. + +2008-04-22 Ted Mielczarek + + * configure.ac: Added check for lex. + + 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 5976e0cd,02428f8f..63665c38 --- a/NEWS +++ b/NEWS @@@ -6,19 -6,52 +6,63 @@@ See the end for copying conditions Please send GNU Wget bug reports to . - * Changes in Wget (MAINLINE). + * Changes in Wget 1.12 (MAINLINE) +** Added support for CSS. This includes: + - Parsing links from CSS files, and from CSS content found in HTML + style tags and attributes. + - Supporting conversion of links found within CSS content, when + --convert-links is specified. + - Ensuring that CSS files end in the ".css" filename extension, + when --convert-links is specified. + + CSS support in Wget is thanks to Ted Mielczarek + . + + ** --ask-password option (and associated wgetrc command) added to + support password prompts at the console. + + * Changes in Wget 1.11.4 + + ** Fixed an issue (apparently a regression) where -O would refuse to + download when -nc was given, even though the file didn't exist. + + ** Fixed a situation where Wget could abort with --continue if the + remote server gives a content-length of zero when the file exists + locally with content. + + ** Fixed a crash on some systems, due to Wget casting a pointer-to-long + to a pointer-to-time_t. + + ** Translation updates for Catalan. + + * Changes in Wget 1.11.3 + + ** Downgraded -N with -O to a warning, rather than an error. + + ** Translation updates + + * 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 doc/ChangeLog index aec852db,d9a87ab3..94d72443 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@@ -1,8 -1,43 +1,48 @@@ + 2008-06-29 Micah Cowan + + * wget.texi : Added Joao Ferreira, Mike Frysinger, + Alain, Guibert, Madhusudan Hosaagrahara, Jim Paris, Kenny + Parnell, Benno Schulenberg, and Pranab Shenoy. Added Steven + Schubiger to the "Special Thanks" section. + + 2008-06-13 Micah Cowan + + * wget.texi (Mailing List): The wget-notify mailing list no longer + receives commit notifications from the source repository. + (Internet Relay Chat): Activity isn't quite so low any more, + remove notice to that effect. + + 2008-05-17 Steven Schubiger + + * wget.texi (Download Options): Change documentation to reflect + the new default value for --prefer-family. + (Wgetrc Commands): Same, for prefer_family wgetrc command. + + 2008-05-12 Micah Cowan + + * wget.texi (Download Options): -N with -O downgraded to a + warning. + + 2008-04-30 Steven Schubiger + + * wget.texi : Document the --ask-password + option. + + 2008-04-27 Micah Cowan + + * wget.texi (Download Options) <-O>: Elaborate on why certain + options make poor combinations with -O. + +2008-04-24 Micah Cowan + + * wget.texi: Adjusted documentation to account for CSS support; + added Ted Mielczarek to contributors. + + 2008-04-22 Mike Frysinger + + * sample.wgetrc: Added prefer_family example. Resolves bug + #22142. + 2008-04-11 Micah Cowan * wget.texi : Added Julien Buty, Alexander diff --cc doc/wget.texi index 95c00d51,fb8e1004..108d7217 --- a/doc/wget.texi +++ b/doc/wget.texi @@@ -3754,12 -3761,15 +3768,18 @@@ Gisle Vanem---many helpful patches and Windows and MS-DOS support. @item -Ralf Wildenhues---Contributed patches to convert Wget to use Automake as +Ralf Wildenhues---contributed patches to convert Wget to use Automake as part of its build process, and various bugfixes. + @item + Steven Schubiger---Many helpful patches, bugfixes and improvements. + Notably, conversion of Wget to use the Gnulib quotes and quoteargs + modules, and the addition of password prompts at the console, via the + Gnulib getpasswd-gnu module. + +@item +Ted Mielczarek---donated support for CSS. + @item People who provided donations for development---including Brian Gough. @end itemize diff --cc src/ChangeLog index 87103b52,d0e26e41..57a05300 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,47 -1,228 +1,272 @@@ + 2008-06-25 Steven Schubiger + + * ftp.c (getftp): When spidering a FTP URL, emit a diagnostic + message if the remote file exists. + + 2008-06-24 Steven Schubiger + + * http.c (http_loop): Replace escnonprint() occurence with + a quotearg_style() call. + + 2008-06-24 Micah Cowan + + * ftp-ls.c (ftp_index): Don't assume time_t* is compatible with + long*. Fixes crash on Windows, and probably other systems. + + 2008-06-22 Steven Schubiger + + * http.c: Explicitly initialize and deallocate the message + string used by the -nv --spider functionality. + + 2008-06-22 Steven Schubiger + + * http.c: Make -nv --spider include the file's name when it + exists. + + 2008-06-22 Micah Cowan + + * Makefile.am (version.c): Fixed version string invocation so it + once again can't result in unterminated strings, made all the + string vars pointers-to-const, and moved line lengths + below 80 (in Makefile.am, not in version.c). + + 2008-06-16 Micah Cowan + + * http.c (http_loop): When hstat.len is higher than the + successfully completed content's length, but it's because we + _set_ it that way, don't abort. + + 2008-06-13 Micah Cowan + + * build_info.c: ENABLE_NTLM, not HAVE_NTLM; distinguish OpenSSL + from "ssl". + + 2008-06-13 Madhusudan Hosaagrahara + + * Makefile.am, main.c, init.c, init.h, build_info.c: Adds build + information to the --version command line option. Fixes bug + #20636. + + 2008-06-01 Micah Cowan + + * main.c [WINDOWS]: Reopen stdout in binary mode, when -O - is + given. + + 2008-05-31 Micah Cowan + + * html-url.c, http.c: Avoid casts in a couple spots. + + 2008-05-30 Henri Häkkinen + + * cookies.c, ftp-basic.c, hash.c, html-url.c, http-ntlm.c, http.c, + init.c, log.c, main.c, progress.c, ptimer.c, spider.c, url.c, + utils.c: Minor changes to silence warnings when using -Wall. + + 2008-05-26 Steven Schubiger + + * ftp.c (getftp): Replace last remaining invocation of escnonprint + with gnulib quote. + + 2008-05-19 Micah Cowan + + * main.c (main): Password prompt should be done only once (not + once per argument), and should be done prior to the background + fork. + + 2008-05-17 Steven Schubiger + + * init.c (defaults): Set the preferred IP family to `none' by + default. + + 2008-05-17 Kenny Parnell + + (cmd_spec_prefer_family): Initialize prefer_family to prefer_none. + + 2008-05-17 Micah Cowan + + * main.c (main): Handle Ctrl-D on command-line. + + 2008-05-15 Steven Schubiger + + * ftp.c (getftp): Verify that the file actually exists in FTP, by + checking it against the listing. + + 2008-05-15 Micah Cowan + + * main.c (prompt_for_password): Use the quote module. + + 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-30 Steven Schubiger + + * main.c (main): New code that handles prompting for passwords + when specified explicitly via command-line option (using gnulib's + getpass-gnu module). + (main): Include the getpass header. + + * init.c: Add "ask-password" to the list of recognized commands. + + * options.h: Add an according boolean member to the options + struct. + + * sysdep.h: Comment the defines __EXTENSIONS__ and _GNU_SOURCE + out, because they're now defined independently by config.h. + + 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-24 Micah Cowan + + * main.c: Revised usage description of --convert-links to apply + to CSS as well as to HTML. + + 2008-04-23 Micah Cowan + + * utils.c (test_dir_matches_p): Added a test for the case + described in issue #20518. + +2008-04-22 Micah Cowan + + * Makefile.am, css.lex, css.l: Renamed css.lex to css.l. + * recur.c (retrieve_tree): Fix typo to allow text/css files to + be parsed. + +2008-04-22 Ted Mielczarek + + * css.lex, css-url.c, css-url.h: Added to implement support for + parsing CSS in Wget. + * convert.c: Convert links in CSS files, too. + * convert.h (convert_options): Added for options link_css_p, + link_expect_css. + * convert.h: Added prototype for new register_css function. + * html-parse.c: Added support for parsing element content, in + addition to tag starts and ends. + * html-parse.h (taginfo): Added delimiter fields for element + content. + * html-url.h: Added. + * html-url.c (append_url): No longer internal-linkage only. Now + takes position and size as explicit parameters. + * html-url.c: Use new html-url.h header, add support for + handling of "style" HTML attributes. Mark URIs obtained from + link tags with rel="stylesheet" with link_expect_css. Adapt + uses of append_url to supply the newly-added parameters for + position and size. + * http.c: Add detection for when the content-type is text/css; + and ensure that such files have the ".css" filename extension, + when --convert-links is active. + * recur.h: Remove declarations for functions found in + html-url.c (moved to html-url.h). + * recur.c: Add support for culling links from CSS files, too, + and tracking for when we're expecting the file to be CSS (even + when its content type isn't text/css). + * retr.c (retrieve_url): Add registration of CSS files. + * wget.h: Added TEXTCSS to dt flags enum. + * Makefile.am: Added css.lex, css-url.c, css-url.h, html-url.h + to wget_SOURCES. + + 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 a29983a9,56ba6108..b869ed11 --- a/src/Makefile.am +++ b/src/Makefile.am @@@ -32,30 -32,37 +32,38 @@@ # The following line is losing on some versions of make! DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\" - LIBS = @LIBS@ @LIBSSL@ @LIBGNUTLS@ @LIBINTL@ + LIBS = @LIBSSL@ @LIBGNUTLS@ @LIBINTL@ @LIBS@ bin_PROGRAMS = wget - wget_SOURCES = cmpt.c connect.c convert.c cookies.c \ + wget_SOURCES = build_info.c cmpt.c connect.c convert.c cookies.c ftp.c \ + css.l css-url.c \ - ftp.c ftp-basic.c \ - ftp-ls.c hash.c host.c html-parse.c html-url.c http.c \ - init.c log.c main.c netrc.c progress.c ptimer.c recur.c \ - res.c retr.c snprintf.c spider.c url.c \ - utils.c xmalloc.c \ - css-url.h connect.h convert.h cookies.h \ - ftp.h gen-md5.h hash.h host.h html-parse.h html-url.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 + ftp-basic.c ftp-ls.c hash.c host.c html-parse.c html-url.c \ + http.c init.c log.c main.c netrc.c progress.c ptimer.c \ + recur.c res.c retr.c snprintf.c spider.c url.c \ + utils.c \ + connect.h convert.h cookies.h \ + 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 nodist_wget_SOURCES = version.c EXTRA_wget_SOURCES = mswindows.c - LDADD = $(ALLOCA) $(LIBOBJS) ../lib/libgnu.a @MD5_LDADD@ - AM_CPPFLAGS = -I $(top_srcdir)/lib @MD5_CPPFLAGS@ + LDADD = $(LIBOBJS) ../lib/libgnu.a @MD5_LDADD@ + AM_CPPFLAGS = -I$(top_srcdir)/lib @MD5_CPPFLAGS@ + ESCAPEQUOTE = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/' version.c: $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am - echo 'const char *version_string = "@VERSION@"' > $@ + echo '/* version.c */' > $@ + echo '/* Autogenerated by Makefile - DO NOT EDIT */' >> $@ + echo '' >> $@ + echo -n 'const char *version_string = "@VERSION@"' >> $@ -hg log -r . --template='" ({node|short})"\n' 2>/dev/null >> $@ echo ';' >> $@ + echo 'const char *compilation_string = "'$(COMPILE)'";' \ + | $(ESCAPEQUOTE) >> $@ + echo 'const char *link_string = "'$(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) $(LIBS) $(wget_LDADD)'";' \ + | $(ESCAPEQUOTE) >> $@ check_LIBRARIES = libunittest.a libunittest_a_SOURCES = $(wget_SOURCES) test.c test.h