use base qw(Exporter);
use Params::Validate qw(validate_with :types);
-use Debbugs::Common qw(:util :lock :quit :misc);
+use Debbugs::Common qw(:util :lock :quit :misc :utf8);
use Debbugs::Config qw(:config);
use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522);
use Debbugs::Packages qw(makesourceversions make_source_versions getversions get_versions binary_to_source);
use Debbugs::Versions::Dpkg;
use POSIX qw(ceil);
use File::Copy qw(copy);
-use Encode qw(decode encode);
+use Encode qw(decode encode is_utf8);
use Storable qw(dclone);
use List::Util qw(min max);
}
return undef;
}
+ binmode($status_fh,':encoding(UTF-8)');
my %data;
my @lines;
my %namemap = reverse %fields;
for my $line (@lines) {
- my @encodings_to_try = qw(utf8 iso8859-1);
- if ($version >= 3) {
- @encodings_to_try = qw(utf8);
- }
- for (@encodings_to_try) {
- my $temp;
- eval {
- $temp = decode("$_",$line,Encode::FB_CROAK);
- };
- if (not $@) { # only update the line if there are no errors.
- $line = $temp;
- last;
- }
- }
if ($line =~ /(\S+?): (.*)/) {
my ($name, $value) = (lc $1, $2);
# this is a bit of a hack; we should never, ever have \r
}
}
for my $field (keys %fields) {
- $data{$field} = '' unless exists $data{$field};
+ $data{$field} = '' unless exists $data{$field};
}
if ($version < 3) {
for my $field (@rfc1522_fields) {
}
%newdata = %{join_status_fields(\%newdata)};
+ %newdata = encode_utf8_structure(%newdata);
+
if ($version < 3) {
for my $field (@rfc1522_fields) {
$newdata{$field} = encode_rfc1522($newdata{$field});
}
}
}
- if ($version >= 3) {
- eval {
- $contents = encode_utf8($contents,Encode::FB_CROAK);
- };
- }
return $contents;
}
die "can't find location for $ref" unless defined $status;
my $sfh;
if ($version >= 3) {
- open $sfh,">:utf8","$status.new" or
+ open $sfh,">","$status.new" or
die "opening $status.new: $!";
}
else {