Fix more encoding issues with the mirrors list.

Do input and output in UTF-8 mode.

Do not encode normal UTF-8 characters.

See-also: <a984a252-43db-0ee8-229d-2a404c93850c@debian.org>

CVS version numbers

english/mirror/mirror_list.pl: 1.171 -> 1.172

1 files changed, 7 insertions, 4 deletions

diff --git a/english/mirror/mirror_list.pl b/english/mirror/mirror_list.pl
index cf1300773bc..f19e23b024e 100755
--- a/english/mirror/mirror_list.pl
+++ b/english/mirror/mirror_list.pl
@@ -9,6 +9,7 @@
 use strict;
 use English;
 use HTML::Entities;
+binmode(STDOUT => ':utf8');
 require 5.001;
 
 my @filter_arches=qw(); # Architectures not to list.
@@ -16,6 +17,8 @@ my @filter_arches=qw(); # Architectures not to list.
 my $officialsiteregex = q{^ftp\d?(?:\.wa)?\...\.debian\.org$};
 my $internalsiteregex = q{^((ftp|security)-master|ftp)\.debian\.org$};
 
+my $encode = '<>&"\'';
+
 use Getopt::Long;
 my ($mirror_source, $output_type, $help);
 my %opthash = (
@@ -599,7 +602,7 @@ END
             } else {
               die "can't find sponsor URL for sponsor $sponsor of $subsite";
             }
-            encode_entities($sponsorname);
+            encode_entities($sponsorname, $encode);
             print "<a href=\"$sponsorurl\">$sponsorname</a>";
             $num++;
             print ", " unless ($num >= $numsponsors);
@@ -619,7 +622,7 @@ END
                 } else {
             die "can't find sponsor URL for sponsor $sponsor of $mirror[$id]{site}";
           }
-          encode_entities($sponsorname);
+          encode_entities($sponsorname, $encode);
           print "<a href=\"$sponsorurl\">$sponsorname</a>";
           $num++;
           print ", " unless ($num >= $numsponsors);
@@ -673,7 +676,7 @@ END
         } else {
           die "can't find sponsor URL for sponsor $sponsor of $mirror[$id]{site}";
         }
-        encode_entities($sponsorname);
+        encode_entities($sponsorname, $encode);
         print "<a href=\"$sponsorurl\">$sponsorname</a>";
         $num++;
         print ",\n" unless ($num >= $numsponsors);
@@ -1117,7 +1120,7 @@ if (defined $help) {
   exit;
 }
 
-open SRC, "<", $mirror_source or
+open SRC, "<:utf8", $mirror_source or
   die "Error: problem opening mirror source file, $mirror_source\n"
      ."Use the -m option?\n";