Rename --html-extension to --adjust-extension.

[wget] / src / http.c

diff --git a/src/http.c b/src/http.c
index 4e49ed4fd1ce0748e598890656a8eb94da2d9de9..d24db5fc38f3393ef6937c32e1ba03e3e6eba24b 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -66,12 +66,12 @@ as that of the covered work.  */
 #include "test.h"
 #endif
 
-#include "version.h"
-
 #ifdef __VMS
 # include "vms.h"
 #endif /* def __VMS */
 
+extern char *version_string;
+
 /* Forward decls. */
 struct http_stat;
 static char *create_authorization_line (const char *, const char *,
@@ -1350,7 +1350,7 @@ free_hstat (struct http_stat *hs)
   if (!opt.useragent)                                                    \
     request_set_header (req, "User-Agent",                               \
                         aprintf ("Wget/%s (VMS %s %s)",                  \
-                        VERSION_STRING, vms_arch(), vms_vers()),         \
+                        version_string, vms_arch(), vms_vers()),         \
                         rel_value);                                      \
   else if (*opt.useragent)                                               \
     request_set_header (req, "User-Agent", opt.useragent, rel_none);     \
@@ -1360,7 +1360,7 @@ free_hstat (struct http_stat *hs)
   if (!opt.useragent)                                                    \
     request_set_header (req, "User-Agent",                               \
                         aprintf ("Wget/%s (%s)",                         \
-                        VERSION_STRING, OS_TYPE),                        \
+                        version_string, OS_TYPE),                        \
                         rel_value);                                      \
   else if (*opt.useragent)                                               \
     request_set_header (req, "User-Agent", opt.useragent, rel_none);     \
@@ -2175,10 +2175,10 @@ File %s already there; not retrieving.\n\n"), quote (hs->local_file));
   else
     *dt &= ~TEXTCSS;
 
-  if (opt.html_extension)
+  if (opt.adjust_extension)
     {
       if (*dt & TEXTHTML)
-        /* -E / --html-extension / html_extension = on was specified,
+        /* -E / --adjust-extension / adjust_extension = on was specified,
            and this is a text/html file.  If some case-insensitive
            variation on ".htm[l]" isn't already the file's suffix,
            tack on ".html". */
@@ -2782,7 +2782,7 @@ Remote file exists.\n\n"));
                   if (finished)
                     {
                       logprintf (LOG_NONVERBOSE, 
-                                 _("%s URL:%s %2d %s\n"), 
+                                 _("%s URL: %s %2d %s\n"), 
                                  tms, u->url, hstat.statcode,
                                  hstat.message ? quotearg_style (escape_quoting_style, hstat.message) : "");
                       goto exit;