treewide: run update-copyrights from gnulib for 2019

[public-inbox.git] / lib / PublicInbox / Hval.pm

diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm
index 7e007027c8ba9d27fc58cf6c6d942b83b1d18c4f..2e883f810023f2a0bb3314e418437cca469365e0 100644 (file)
--- a/lib/PublicInbox/Hval.pm
+++ b/lib/PublicInbox/Hval.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # represents a header value in various forms.  Used for HTML generation
@@ -10,7 +10,7 @@ use Encode qw(find_encoding);
 use PublicInbox::MID qw/mid_clean mid_escape/;
 use base qw/Exporter/;
 our @EXPORT_OK = qw/ascii_html obfuscate_addrs to_filename src_escape
-               to_attr from_attr prurl/;
+               to_attr prurl/;
 my $enc_ascii = find_encoding('us-ascii');
 
 # safe-ish acceptable filename pattern for portability
@@ -139,22 +139,12 @@ sub to_attr ($) {
        return if index($str, '//') >= 0;
 
        my $first = '';
+       utf8::encode($str); # to octets
        if ($str =~ s/\A([^A-Ya-z])//ms) { # start with a letter
                  $first = sprintf('Z%02x', ord($1));
        }
        $str =~ s/([^A-Za-z0-9_\.\-])/$ESCAPES{$1}/egms;
-       $first . $str;
-}
-
-# reverse the result of to_attr
-sub from_attr ($) {
-       my ($str) = @_;
-       my $first = '';
-       if ($str =~ s/\AZ([a-f0-9]{2})//ms) {
-               $first = chr(hex($1));
-       }
-       $str =~ s!::([a-f0-9]{2})!chr(hex($1))!egms;
-       $str =~ tr!:!/!;
+       utf8::decode($str); # allow wide chars
        $first . $str;
 }