Do not adjust the extension if the file ends in .htm.

diff --git a/NEWS b/NEWS
index 5fe73d675674790c6f7fc77a5259a87dd62b6bc1..ff2ed06d47d55e1c6f5a1ccbde9fa2028dd6a21a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -54,6 +54,9 @@ Please send GNU Wget bug reports to <bug-wget@gnu.org>.
 
 ** Fix an infinite loop with the error '<filename> has sprung into existence'
    on a network error and -nc is used.
 
 ** Fix an infinite loop with the error '<filename> has sprung into existence'
    on a network error and -nc is used.

+
+** Now --adjust-extension does not modify the file extension if the file ends
+   in .htm.

 \f
 * Changes in Wget 1.12
 
 \f
 * Changes in Wget 1.12
 

diff --git a/src/ChangeLog b/src/ChangeLog
index b421f2645720d33892ba1078632d720c56d533cc..6230268609b2f650722e1901cd9fa59e5fdd5d10 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-02  Tomasz Buchert <tomek.buchert@gmail.com> (tiny change)
+
+       * http.c (ensure_extension): Do not adjust the extension if the file
+       ends in .htm.
+

 2011-02-22  Gilles Carry  <gilles dot carry at st dot com>
 
        * main.c (prompt_for_password): Use stderr instead of stdout
 2011-02-22  Gilles Carry  <gilles dot carry at st dot com>
 
        * main.c (prompt_for_password): Use stderr instead of stdout

diff --git a/src/http.c b/src/http.c
index b4f1667b6e597b0bf6972a0466e658b3bda3a6ef..d7e55ca824318747f447d6fa4d2be5748c87db78 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -3501,7 +3501,7 @@ ensure_extension (struct http_stat *hs, const char *ext, int *dt)
   if (len == 5)
     {
       strncpy (shortext, ext, len - 1);
   if (len == 5)
     {
       strncpy (shortext, ext, len - 1);

-      shortext[len - 2] = '\0';
+      shortext[len - 1] = '\0';

     }
 
   if (last_period_in_local_filename == NULL
     }
 
   if (last_period_in_local_filename == NULL