Support shorthand URLs in an input file

diff --git a/NEWS b/NEWS
index ce6229957df67915565b90ac5a9f77309a9a6cc9..526aab534e67490859526861a5e2126f112f2f79 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@ Please send GNU Wget bug reports to <bug-wget@gnu.org>.
 ** Support FTP listing for the FTP Server on Windows Server 2008 R2.
 
 ** Fix a regression when -c and --content-disposition are used together.
 ** Support FTP listing for the FTP Server on Windows Server 2008 R2.
 
 ** Fix a regression when -c and --content-disposition are used together.

+
+** Support shorthand URLs in an input file.

 \f
 * Changes in Wget 1.14
 
 \f
 * Changes in Wget 1.14
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 2ccfe6f30607653316a09772b01fe2df044d34e5..ec78fe8ca889243b9212a0643343cacf6529fdaa 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-29  Rohit Mathulla <rohit_mathulla@yahoo.com> (tiny change)
+
+       * html-url.c (get_urls_file): Convert shorthand URLs.
+

 2012-10-07  Ray Satiro <raysatiro@yahoo.com>
 
        * url.c: Change the functions of a growable string object to null
 2012-10-07  Ray Satiro <raysatiro@yahoo.com>
 
        * url.c: Change the functions of a growable string object to null

diff --git a/src/html-url.c b/src/html-url.c
index 855393a726a03dedc6fcd71d74d51304ec1549d9..f02982173cec0302e0295e68aaecac5abad5942d 100644 (file)
--- a/src/html-url.c
+++ b/src/html-url.c
@@ -804,6 +804,13 @@ get_urls_file (const char *file)
           url_text = merged;
         }
 
           url_text = merged;
         }
 

+      char *new_url = rewrite_shorthand_url (url_text);
+      if (new_url)
+        {
+          xfree (url_text);
+          url_text = new_url;
+        }
+

       url = url_parse (url_text, &up_error_code, NULL, false);
       if (!url)
         {
       url = url_parse (url_text, &up_error_code, NULL, false);
       if (!url)
         {