Hi Giuseppe, I've started the assignment process, to at least get the ball rolling, even if it's not complete in time for the new release.
I've also made the changes you suggested to coding style, and split the changes into two patches. Thanks so much for your help and suggestions! Do let me know if more changes are needd. Regards, - Daniel On Sat, Apr 23, 2011 at 10:45 AM, Giuseppe Scrivano <[email protected]> wrote: > Thanks for the patch. It looks ok but in order to apply it, you need to > complete the copyright assignments process to the FSF. We are very > quite close to have a wget release and I doubt the FSF will receive your > assignments before it. Can you please divide your patch in two? Keep > changes to the source code in one patch and the new tests in another. > > Please keep the GNU coding style: > > > Daniel Manrique <[email protected]> writes: > >> === modified file 'src/html-url.c' >> --- src/html-url.c 2011-01-01 12:19:37 +0000 >> +++ src/html-url.c 2011-04-23 00:48:22 +0000 >> @@ -810,6 +810,7 @@ >> file, url_text, error); >> xfree (url_text); >> xfree (error); >> + inform_exit_status(URLERROR); > > Please maintain the GNU coding style: > > inform_exit_status (URLERROR); > > Cheers, > Giuseppe >
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected]\ # iaihkimpxowwm0gh # target_branch: file:///home/roadmr/wget/trunk/ # testament_sha1: 3f2bdd4370318611a56293444fe3f320d8e39961 # timestamp: 2011-04-23 15:31:47 -0400 # base_revision_id: [email protected] # # Begin patch === modified file 'src/ChangeLog' --- src/ChangeLog 2011-04-19 12:40:21 +0000 +++ src/ChangeLog 2011-04-23 19:31:41 +0000 @@ -1,3 +1,9 @@ +2011-04-21 Daniel Manrique <[email protected]> + * main.c (main): Set exit status when invalid host name given in + command line. + * html-url.c (get_urls_file): Set exit status when invalid host + name given in input file. + 2011-04-19 Giuseppe Scrivano <[email protected]> * gnutls.c: Do not include <fcntl.h>. === modified file 'src/html-url.c' --- src/html-url.c 2011-01-01 12:19:37 +0000 +++ src/html-url.c 2011-04-23 19:31:41 +0000 @@ -810,6 +810,7 @@ file, url_text, error); xfree (url_text); xfree (error); + inform_exit_status (URLERROR); continue; } xfree (url_text); === modified file 'src/main.c' --- src/main.c 2011-03-21 12:14:20 +0000 +++ src/main.c 2011-04-23 19:31:41 +0000 @@ -1347,6 +1347,7 @@ char *error = url_error (*t, url_err); logprintf (LOG_NOTQUIET, "%s: %s.\n",*t, error); xfree (error); + inform_exit_status (URLERROR); } else { @@ -1387,7 +1388,9 @@ if (opt.input_filename) { int count; - retrieve_from_file (opt.input_filename, opt.force_html, &count); + int status; + status = retrieve_from_file (opt.input_filename, opt.force_html, &count); + inform_exit_status (status); if (!count) logprintf (LOG_NOTQUIET, _("No URLs found in %s.\n"), opt.input_filename); # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRZjdEsAAsLfgBEwUXf//14G mgC////wUAV4ke6axYuSJTQNCSSJgp6bSniZNGmSg8BEaAxGI9QJSTSbBCemTSmQ0AAAAAACRIRq aaZAo9Twoeo9TIBpoMmRkyBzAJpgEyGAAJgmAAACSRMQ0IwTITQ9FT0nqPKPKMgAHqTRML+HX3S0 67LOA2zs2H3N++u6sO4mwtnZ5N94BJee7g8lJO6yJaUlCKbu46ZP7S3KRVttpjWzqF5p1z4SMM8G muiVYiTUTrK14GGjsORgFF2f2CXWuWqGhnQaFb6uXJghBhUKqq2vWX+baldir5I6BQsJXgcrbft2 tXvMIsX9TKtFgwwvQRVmSjEqJ6rcaC9BiVxnkGmdoK48BeVXqmW5b8dtqBygWbdEIKOSBtAOaB3z DjoQdxTT0QJRwNaCqJqQwn6BjKS2CPGtmIqYwogLhFeLQZqRzQktpnuDpOSAmwiEd5SWmQSJXPfH NrZo+YMZo3CJQyPvP03kUCM1lfCtYQEIWjTRUkZSo1iolTH4IH2MgN4S4EZDjOkQ8TuRrpegx1hf bUZsJ514E+H93hy+Ay3aYZXYF6BxNxdqEBDhEZQhIkUjiciArkIxe2M+eWsZdhXVEUvwxoF6SpYb C0JtI0dXPM1WrEC4pNcMjgcxMYbqi0K+A0Uxbk+1BQWUYWQfjW68YOLhpTEbbarMiy0YpAdXv5YX WK3puQ58DAZGRYXXsDOLqWgY6VTwaaB4xwSILG1pFqDB5eWNNILmZihBSmuF5I+olcihxY+6dEGR I4oKiT8oPB7i56Q2ExjeXGFpvade60TZYLyCDSeIfMzT3BZjVyzZJCiyyApCHYSiYWittdQ+HENC 9u29tmuIhvnTDm49SjpFvBW5U023+rb/VP9nQRMg7zwIKk7X2mYNWq5GmFApfSQigFk9HcMuYuvQ 7Gx0eQ9HlJ6uLuaFu5i9RGCPD5qCsVjAuYKOOxJepIL2OlKCJTIOlvZ3lhYciDUtJ3gsKAy+hwEM FqY6TFwd21+ce+Z8oatfPnsCxovBfPL+MkHUXSSqs56xxOZQZZlVKKD7ipF5RMilUeUPkbBU9Cj8 vfkMsBmscH06+fjmXQobHtEvXYq8jcw6Xhe9QC3SAocCerXS3wguJc9bbvNxQUkSpdMDJka7LMtl Gg/inlfmcLuX9UyUk5pJNIxyWjEx2EZx35B2h+Ap9k1XBMnZc2UBLC29XC8uPukcJjwzIPIRWuiD /BRBTF3oKBZsm2A/1wlxCMPhP0ETWLcfdtAPO45hhzEZGPmn2JM8lDsGoipChP2IeoUOFNn6nWLJ 2EC23x4CedBbRcYBbFXEn9wd5sI4iz5k1MHBUKpwd6FFYNv94FMtyCs7CNhDEE3Cfjs0or4uFSC1 3ke9FBCAQEaIXOEGgbTsYNFgLN+KQpCVEpUgJJLkwIGGygk5kYicLr2FeJfzodwJ+AJxIXtQbtYi r7CYXs9eCuBY2bCOO1nJkyHhGvOh5kQEaYmmitQQBSF9Nk58UFs9nBAX4oK+2e4tFvRIXU6gys8h qeNedlWCD3QOViDwqhyFKYatNaiZSR2vVKCmxNFfXwXg0xRBNbxpW95ctFiRg9dBQUpCH3zFiIqs 8bTwR6gqxWqxosi2pA4XpQgiBW8DVnhvHl1SDQbKaFSJzJycKxcRE4ilB6SiKoQyVC9guQdgz5Uh L/xdyRThQkBZjdEs
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected]\ # txpcufw9foq6h3w6 # target_branch: file:///home/roadmr/wget/trunk/ # testament_sha1: 3dbd7404a6680059ad94733510dec206eab947fa # timestamp: 2011-04-23 15:43:12 -0400 # base_revision_id: [email protected] # # Begin patch === modified file 'src/ChangeLog' --- src/ChangeLog 2011-04-19 12:40:21 +0000 +++ src/ChangeLog 2011-04-23 19:31:41 +0000 @@ -1,3 +1,9 @@ +2011-04-21 Daniel Manrique <[email protected]> + * main.c (main): Set exit status when invalid host name given in + command line. + * html-url.c (get_urls_file): Set exit status when invalid host + name given in input file. + 2011-04-19 Giuseppe Scrivano <[email protected]> * gnutls.c: Do not include <fcntl.h>. === modified file 'src/html-url.c' --- src/html-url.c 2011-01-01 12:19:37 +0000 +++ src/html-url.c 2011-04-23 19:31:41 +0000 @@ -810,6 +810,7 @@ file, url_text, error); xfree (url_text); xfree (error); + inform_exit_status (URLERROR); continue; } xfree (url_text); === modified file 'src/main.c' --- src/main.c 2011-03-21 12:14:20 +0000 +++ src/main.c 2011-04-23 19:31:41 +0000 @@ -1347,6 +1347,7 @@ char *error = url_error (*t, url_err); logprintf (LOG_NOTQUIET, "%s: %s.\n",*t, error); xfree (error); + inform_exit_status (URLERROR); } else { @@ -1387,7 +1388,9 @@ if (opt.input_filename) { int count; - retrieve_from_file (opt.input_filename, opt.force_html, &count); + int status; + status = retrieve_from_file (opt.input_filename, opt.force_html, &count); + inform_exit_status (status); if (!count) logprintf (LOG_NOTQUIET, _("No URLs found in %s.\n"), opt.input_filename); === modified file 'tests/ChangeLog' --- tests/ChangeLog 2011-04-19 10:33:46 +0000 +++ tests/ChangeLog 2011-04-23 19:43:03 +0000 @@ -1,3 +1,11 @@ +2011-04-23 Daniel Manrique <[email protected]> + * Test-invalid-host-as-input-file.px: New file. + * Test-invalid-host-command-line.px: New file. + * Test-invalid-host-from-file.px: New file. + * Makefile.am (EXTRA_DIST): Add Test-invalid-host-as-input-file.px, + Test-invalid-host-command-line.px, Test-invalid-host-from-file.px. + * run-px (tests): Likewise. + 2011-04-19 Giuseppe Scrivano <[email protected]> * Makefile.am (LIBS): Add $(LIB_CLOCK_GETTIME). === modified file 'tests/Makefile.am' --- tests/Makefile.am 2011-04-19 10:33:46 +0000 +++ tests/Makefile.am 2011-04-23 19:43:03 +0000 @@ -91,6 +91,9 @@ Test-idn-meta.px \ Test-idn-cmd.px \ Test-idn-robots.px \ + Test-invalid-host-as-input-file.px \ + Test-invalid-host-command-line.px \ + Test-invalid-host-from-file.px \ Test-iri.px \ Test-iri-percent.px \ Test-iri-disabled.px \ === added file 'tests/Test-invalid-host-as-input-file.px' --- tests/Test-invalid-host-as-input-file.px 1970-01-01 00:00:00 +0000 +++ tests/Test-invalid-host-as-input-file.px 2011-04-23 19:43:03 +0000 @@ -0,0 +1,24 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +use HTTPTest; + + +############################################################################### + + +my $cmdline = $WgetTest::WGETPATH . " -i http://";; + +my $expected_error_code = 1; + +############################################################################### + +my $the_test = HTTPTest->new (name => "Test-invalid-host-as-input-file", + cmdline => $cmdline, + errcode => $expected_error_code); +exit $the_test->run(); + +# vim: et ts=4 sw=4 + === added file 'tests/Test-invalid-host-command-line.px' --- tests/Test-invalid-host-command-line.px 1970-01-01 00:00:00 +0000 +++ tests/Test-invalid-host-command-line.px 2011-04-23 19:43:03 +0000 @@ -0,0 +1,24 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +use HTTPTest; + + +############################################################################### + +my $cmdline = $WgetTest::WGETPATH . " http://";; + +my $expected_error_code = 1; + + +############################################################################### + +my $the_test = HTTPTest->new (name => "Test-invalid-host-command-line", + cmdline => $cmdline, + errcode => $expected_error_code); +exit $the_test->run(); + +# vim: et ts=4 sw=4 + === added file 'tests/Test-invalid-host-from-file.px' --- tests/Test-invalid-host-from-file.px 1970-01-01 00:00:00 +0000 +++ tests/Test-invalid-host-from-file.px 2011-04-23 19:43:03 +0000 @@ -0,0 +1,48 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +use HTTPTest; + + +############################################################################### + +my $urls = <<EOF; +http:// +http://:8080 +EOF + +# code, msg, headers, content +my %urls = ( + '/urls.txt' => { + code => "200", + msg => "Ok", + headers => { + "Content-type" => "text/plain", + }, + content => $urls, + }, +); + +my $cmdline = $WgetTest::WGETPATH . " -i http://localhost:{{port}}/urls.txt";; + +my $expected_error_code = 1; + +my %expected_downloaded_files = ( + 'urls.txt' => { + content => $urls, + }, +); + +############################################################################### + +my $the_test = HTTPTest->new (name => "Test-invalid-host-from-file", + input => \%urls, + cmdline => $cmdline, + errcode => $expected_error_code, + output => \%expected_downloaded_files); +exit $the_test->run(); + +# vim: et ts=4 sw=4 + === modified file 'tests/run-px' --- tests/run-px 2010-05-29 21:10:59 +0000 +++ tests/run-px 2011-04-23 19:43:03 +0000 @@ -40,6 +40,9 @@ 'Test-HTTP-Content-Disposition.px', 'Test-i-ftp.px', 'Test-i-http.px', + 'Test-invalid-host-as-input-file.px', + 'Test-invalid-host-command-line.px', + 'Test-invalid-host-from-file.px', 'Test-idn-headers.px', 'Test-idn-meta.px', 'Test-idn-cmd.px', # Begin bundle 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 F63d7nkPJd/4u5IpwoSDc9z8AA==
