Whitespace and formatting changes.(Aesthetic only)

[wget] / src / convert.c

diff --git a/src/convert.c b/src/convert.c
index 7b38550be5ee803ba839a8223373c8a8b5a66fe7..abad5db09af50bb528f9c5f102596b6be1a613ba 100644 (file)
--- a/src/convert.c
+++ b/src/convert.c
@@ -1,11 +1,12 @@
 /* Conversion of links to local files.
 /* Conversion of links to local files.

-   Copyright (C) 2003-2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.

 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or

  (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
  (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,


@@ -14,31 +15,27 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License

-along with Wget; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.

 
 

-In addition, as a special exception, the Free Software Foundation
-gives permission to link the code of its release of Wget with the
-OpenSSL project's "OpenSSL" library (or with modified versions of it
-that use the same license as the "OpenSSL" library), and distribute
-the linked executables.  You must obey the GNU General Public License
-in all respects for all of the code used other than "OpenSSL".  If you
-modify this file, you may extend this exception to your version of the
-file, but you are not obligated to do so.  If you do not wish to do
-so, delete this exception statement from your version.  */
+Additional permission under GNU GPL version 3 section 7

 
 

-#include <config.h>
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.  */
+
+#include "wget.h"

 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>

 #include <errno.h>
 #include <assert.h>
 #include <errno.h>
 #include <assert.h>

-
-#include "wget.h"

 #include "convert.h"
 #include "url.h"
 #include "recur.h"
 #include "convert.h"
 #include "url.h"
 #include "recur.h"


@@ -48,6 +45,7 @@ so, delete this exception statement from your version.  */
 #include "res.h"
 #include "html-url.h"
 #include "css-url.h"
 #include "res.h"
 #include "html-url.h"
 #include "css-url.h"

+#include "iri.h"

 
 static struct hash_table *dl_file_url_map;
 struct hash_table *dl_url_file_map;
 
 static struct hash_table *dl_file_url_map;
 struct hash_table *dl_url_file_map;


@@ -60,7 +58,7 @@ struct hash_table *downloaded_css_set;
 static void convert_links (const char *, struct urlpos *);
 
 
 static void convert_links (const char *, struct urlpos *);
 
 

-void
+static void

 convert_links_in_hashtable (struct hash_table *downloaded_set,
                             int is_css,
                             int *file_count)
 convert_links_in_hashtable (struct hash_table *downloaded_set,
                             int is_css,
                             int *file_count)


@@ -97,7 +95,7 @@ convert_links_in_hashtable (struct hash_table *downloaded_set,
 
       /* Parse the file...  */
       urls = is_css ? get_urls_css_file (file, url) :
 
       /* Parse the file...  */
       urls = is_css ? get_urls_css_file (file, url) :

-                      get_urls_html (file, url, NULL);
+                      get_urls_html (file, url, NULL, NULL);

 
       /* We don't respect meta_disallow_follow here because, even if
          the file is not followed, we might still want to convert the
 
       /* We don't respect meta_disallow_follow here because, even if
          the file is not followed, we might still want to convert the


@@ -106,7 +104,8 @@ convert_links_in_hashtable (struct hash_table *downloaded_set,
       for (cur_url = urls; cur_url; cur_url = cur_url->next)
         {
           char *local_name;
       for (cur_url = urls; cur_url; cur_url = cur_url->next)
         {
           char *local_name;

-          struct url *u = cur_url->url;
+          struct url *u;
+          struct iri *pi;

 
           if (cur_url->link_base_p)
             {
 
           if (cur_url->link_base_p)
             {


@@ -120,6 +119,14 @@ convert_links_in_hashtable (struct hash_table *downloaded_set,
           /* We decide the direction of conversion according to whether
              a URL was downloaded.  Downloaded URLs will be converted
              ABS2REL, whereas non-downloaded will be converted REL2ABS.  */
           /* We decide the direction of conversion according to whether
              a URL was downloaded.  Downloaded URLs will be converted
              ABS2REL, whereas non-downloaded will be converted REL2ABS.  */

+
+          pi = iri_new ();
+          set_uri_encoding (pi, opt.locale, true);
+
+          u = url_parse (cur_url->url->url, NULL, pi, true);
+          if (!u)
+              continue;
+

           local_name = hash_table_get (dl_url_file_map, u->url);
 
           /* Decide on the conversion type.  */
           local_name = hash_table_get (dl_url_file_map, u->url);
 
           /* Decide on the conversion type.  */


@@ -145,6 +152,9 @@ convert_links_in_hashtable (struct hash_table *downloaded_set,
               cur_url->local_name = NULL;
               DEBUGP (("will convert url %s to complete\n", u->url));
             }
               cur_url->local_name = NULL;
               DEBUGP (("will convert url %s to complete\n", u->url));
             }

+
+          url_free (u);
+          iri_free (pi);

         }
 
       /* Convert the links in the file.  */
         }
 
       /* Convert the links in the file.  */


@@ -183,9 +193,10 @@ convert_all_links (void)
   convert_links_in_hashtable (downloaded_css_set, 1, &file_count);
 
   secs = ptimer_measure (timer);
   convert_links_in_hashtable (downloaded_css_set, 1, &file_count);
 
   secs = ptimer_measure (timer);

-  ptimer_destroy (timer);

   logprintf (LOG_VERBOSE, _("Converted %d files in %s seconds.\n"),
              file_count, print_decimal (secs));
   logprintf (LOG_VERBOSE, _("Converted %d files in %s seconds.\n"),
              file_count, print_decimal (secs));

+
+  ptimer_destroy (timer);

 }
 
 static void write_backup_file (const char *, downloaded_file_t);
 }
 
 static void write_backup_file (const char *, downloaded_file_t);


@@ -193,7 +204,7 @@ static const char *replace_plain (const char*, int, FILE*, const char *);
 static const char *replace_attr (const char *, int, FILE *, const char *);
 static const char *replace_attr_refresh_hack (const char *, int, FILE *,
                                               const char *, int);
 static const char *replace_attr (const char *, int, FILE *, const char *);
 static const char *replace_attr_refresh_hack (const char *, int, FILE *,
                                               const char *, int);

-static char *local_quote_string (const char *);
+static char *local_quote_string (const char *, bool);

 static char *construct_relative (const char *, const char *);
 
 /* Change the links in one file.  LINKS is a list of links in the
 static char *construct_relative (const char *, const char *);
 
 /* Change the links in one file.  LINKS is a list of links in the


@@ -228,7 +239,7 @@ convert_links (const char *file, struct urlpos *links)
       }
   }
 
       }
   }
 

-  fm = read_file (file);
+  fm = wget_read_file (file);

   if (!fm)
     {
       logprintf (LOG_NOTQUIET, _("Cannot convert links in %s: %s\n"),
   if (!fm)
     {
       logprintf (LOG_NOTQUIET, _("Cannot convert links in %s: %s\n"),


@@ -246,9 +257,9 @@ convert_links (const char *file, struct urlpos *links)
      zeroes from the mmaped region.  */
   if (unlink (file) < 0 && errno != ENOENT)
     {
      zeroes from the mmaped region.  */
   if (unlink (file) < 0 && errno != ENOENT)
     {

-      logprintf (LOG_NOTQUIET, _("Unable to delete `%s': %s\n"),
-                 file, strerror (errno));
-      read_file_free (fm);
+      logprintf (LOG_NOTQUIET, _("Unable to delete %s: %s\n"),
+                 quote (file), strerror (errno));
+      wget_read_file_free (fm);

       return;
     }
   /* Now open the file for writing.  */
       return;
     }
   /* Now open the file for writing.  */


@@ -257,7 +268,7 @@ convert_links (const char *file, struct urlpos *links)
     {
       logprintf (LOG_NOTQUIET, _("Cannot convert links in %s: %s\n"),
                  file, strerror (errno));
     {
       logprintf (LOG_NOTQUIET, _("Cannot convert links in %s: %s\n"),
                  file, strerror (errno));

-      read_file_free (fm);
+      wget_read_file_free (fm);

       return;
     }
 
       return;
     }
 


@@ -291,7 +302,8 @@ convert_links (const char *file, struct urlpos *links)
           /* Convert absolute URL to relative. */
           {
             char *newname = construct_relative (file, link->local_name);
           /* Convert absolute URL to relative. */
           {
             char *newname = construct_relative (file, link->local_name);

-            char *quoted_newname = local_quote_string (newname);
+            char *quoted_newname = local_quote_string (newname,
+                                                       link->link_css_p);

 
             if (link->link_css_p)
               p = replace_plain (p, link->size, fp, quoted_newname);
 
             if (link->link_css_p)
               p = replace_plain (p, link->size, fp, quoted_newname);


@@ -315,7 +327,7 @@ convert_links (const char *file, struct urlpos *links)
             char *quoted_newlink = html_quote_string (newlink);
 
             if (link->link_css_p)
             char *quoted_newlink = html_quote_string (newlink);
 
             if (link->link_css_p)

-              p = replace_plain (p, link->size, fp, quoted_newlink);
+              p = replace_plain (p, link->size, fp, newlink);

             else if (!link->link_refresh_p)
               p = replace_attr (p, link->size, fp, quoted_newlink);
             else
             else if (!link->link_refresh_p)
               p = replace_attr (p, link->size, fp, quoted_newlink);
             else


@@ -342,7 +354,7 @@ convert_links (const char *file, struct urlpos *links)
   if (p - fm->content < fm->length)
     fwrite (p, 1, fm->length - (p - fm->content), fp);
   fclose (fp);
   if (p - fm->content < fm->length)
     fwrite (p, 1, fm->length - (p - fm->content), fp);
   fclose (fp);

-  read_file_free (fm);
+  wget_read_file_free (fm);

 
   logprintf (LOG_VERBOSE, "%d-%d\n", to_file_count, to_url_count);
 }
 
   logprintf (LOG_VERBOSE, "%d-%d\n", to_file_count, to_url_count);
 }


@@ -420,7 +432,8 @@ write_backup_file (const char *file, downloaded_file_t downloaded_file_return)
   /* Rather than just writing over the original .html file with the
      converted version, save the former to *.orig.  Note we only do
      this for files we've _successfully_ downloaded, so we don't
   /* Rather than just writing over the original .html file with the
      converted version, save the former to *.orig.  Note we only do
      this for files we've _successfully_ downloaded, so we don't

-     clobber .orig files sitting around from previous invocations. */
+     clobber .orig files sitting around from previous invocations.
+     On VMS, use "_orig" instead of ".orig".  See "wget.h". */

 
   /* Construct the backup filename as the original name plus ".orig". */
   size_t         filename_len = strlen (file);
 
   /* Construct the backup filename as the original name plus ".orig". */
   size_t         filename_len = strlen (file);


@@ -443,9 +456,9 @@ write_backup_file (const char *file, downloaded_file_t downloaded_file_return)
   else /* downloaded_file_return == FILE_DOWNLOADED_NORMALLY */
     {
       /* Append ".orig" to the name. */
   else /* downloaded_file_return == FILE_DOWNLOADED_NORMALLY */
     {
       /* Append ".orig" to the name. */

-      filename_plus_orig_suffix = alloca (filename_len + sizeof (".orig"));
+      filename_plus_orig_suffix = alloca (filename_len + sizeof (ORIG_SFX));

       strcpy (filename_plus_orig_suffix, file);
       strcpy (filename_plus_orig_suffix, file);

-      strcpy (filename_plus_orig_suffix + filename_len, ".orig");
+      strcpy (filename_plus_orig_suffix + filename_len, ORIG_SFX);

     }
 
   if (!converted_files)
     }
 
   if (!converted_files)


@@ -590,25 +603,25 @@ find_fragment (const char *beg, int size, const char **bp, const char **ep)
 
    We quote ? as %3F to avoid passing part of the file name as the
    parameter when browsing the converted file through HTTP.  However,
 
    We quote ? as %3F to avoid passing part of the file name as the
    parameter when browsing the converted file through HTTP.  However,

-   it is safe to do this only when `--html-extension' is turned on.
+   it is safe to do this only when `--adjust-extension' is turned on.

    This is because converting "index.html?foo=bar" to
    "index.html%3Ffoo=bar" would break local browsing, as the latter
    isn't even recognized as an HTML file!  However, converting
    "index.html?foo=bar.html" to "index.html%3Ffoo=bar.html" should be
    safe for both local and HTTP-served browsing.
 
    This is because converting "index.html?foo=bar" to
    "index.html%3Ffoo=bar" would break local browsing, as the latter
    isn't even recognized as an HTML file!  However, converting
    "index.html?foo=bar.html" to "index.html%3Ffoo=bar.html" should be
    safe for both local and HTTP-served browsing.
 

-   We always quote "#" as "%23" and "%" as "%25" because those
-   characters have special meanings in URLs.  */
+   We always quote "#" as "%23", "%" as "%25" and ";" as "%3B"
+   because those characters have special meanings in URLs.  */

 
 static char *
 
 static char *

-local_quote_string (const char *file)
+local_quote_string (const char *file, bool no_html_quote)

 {
   const char *from;
   char *newname, *to;
 
 {
   const char *from;
   char *newname, *to;
 

-  char *any = strpbrk (file, "?#%");
+  char *any = strpbrk (file, "?#%;");

   if (!any)
   if (!any)

-    return html_quote_string (file);
+    return no_html_quote ? strdup (file) : html_quote_string (file);

 
   /* Allocate space assuming the worst-case scenario, each character
      having to be quoted.  */
 
   /* Allocate space assuming the worst-case scenario, each character
      having to be quoted.  */


@@ -626,8 +639,13 @@ local_quote_string (const char *file)
         *to++ = '2';
         *to++ = '3';
         break;
         *to++ = '2';
         *to++ = '3';
         break;

+      case ';':
+        *to++ = '%';
+        *to++ = '3';
+        *to++ = 'B';
+        break;

       case '?':
       case '?':

-        if (opt.html_extension)
+        if (opt.adjust_extension)

           {
             *to++ = '%';
             *to++ = '3';
           {
             *to++ = '%';
             *to++ = '3';


@@ -640,7 +658,7 @@ local_quote_string (const char *file)
       }
   *to = '\0';
 
       }
   *to = '\0';
 

-  return html_quote_string (newname);
+  return no_html_quote ? strdup (newname) : html_quote_string (newname);

 }
 \f
 /* Book-keeping code for dl_file_url_map, dl_url_file_map,
 }
 \f
 /* Book-keeping code for dl_file_url_map, dl_url_file_map,


@@ -855,7 +873,7 @@ register_delete_file (const char *file)
 /* Register that FILE is an HTML file that has been downloaded. */
 
 void
 /* Register that FILE is an HTML file that has been downloaded. */
 
 void

-register_html (const char *url, const char *file)
+register_html (const char *file)

 {
   if (!downloaded_html_set)
     downloaded_html_set = make_string_hash_table (0);
 {
   if (!downloaded_html_set)
     downloaded_html_set = make_string_hash_table (0);


@@ -865,7 +883,7 @@ register_html (const char *url, const char *file)
 /* Register that FILE is a CSS file that has been downloaded. */
 
 void
 /* Register that FILE is a CSS file that has been downloaded. */
 
 void

-register_css (const char *url, const char *file)
+register_css (const char *file)

 {
   if (!downloaded_css_set)
     downloaded_css_set = make_string_hash_table (0);
 {
   if (!downloaded_css_set)
     downloaded_css_set = make_string_hash_table (0);


@@ -912,7 +930,7 @@ static struct hash_table *downloaded_files_hash;
    However, our hash tables only accept pointers for keys and values.
    So when we need a pointer, we use the address of a
    downloaded_file_t variable of static storage.  */
    However, our hash tables only accept pointers for keys and values.
    So when we need a pointer, we use the address of a
    downloaded_file_t variable of static storage.  */

-   
+

 static downloaded_file_t *
 downloaded_mode_to_ptr (downloaded_file_t mode)
 {
 static downloaded_file_t *
 downloaded_mode_to_ptr (downloaded_file_t mode)
 {