Hi Daniel, thanks for your contribution! I have pushed your first patch. I will wait for your copyright assignments before push the patch with the new tests.
Thanks again, Giuseppe Daniel Manrique <dan...@tomechangosubanana.com> writes: > 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 <gscriv...@gnu.org> 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 <dan...@tomechangosubanana.com> 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: roa...@tomechangosubanana.com-20110423193141-\ > # iaihkimpxowwm0gh > # target_branch: file:///home/roadmr/wget/trunk/ > # testament_sha1: 3f2bdd4370318611a56293444fe3f320d8e39961 > # timestamp: 2011-04-23 15:31:47 -0400 > # base_revision_id: gscriv...@gnu.org-20110419124021-fi310a2hc7mz2j9y > # > # 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 <roa...@tomechangosubanana.com> > + * 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 <gscriv...@gnu.org> > > * 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