From: "Ismail Dönmez" <ismail@pardus•org.tr>
To: git@vger•kernel.org
Subject: [PATCH] gitweb: use decode_utf8 directly
Date: Tue, 24 Apr 2007 17:05:15 +0300 [thread overview]
Message-ID: <200704241705.19661.ismail@pardus.org.tr> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 1074 bytes --]
Hi,
gitweb currently uses Encode::decode function with a wrapper like this :
# very thin wrapper for decode("utf8", $str, Encode::FB_DEFAULT);
sub to_utf8 {
my $str = shift;
return decode("utf8", $str, Encode::FB_DEFAULT);
}
But for me this gives the following error when I try to view RSS feed for
Linux kernel GIT repo (local checkout) :
Cannot decode string with wide characters
at /usr/lib/perl5/vendor_perl/5.8.8/i686-linux/Encode.pm line 162.
I Google'd a bit but the relevant information seems to be missing about this
error. Anyhow there is no need for a wrapper at all as Encode class has a
decode_utf8 function which fixes the problem I am experiencing too and chops
off the unneeded wrapper.
Patch against git 1.5.1.2 is attached. Comments welcome.
P.S: I am using Encode 2.20 from CPAN which is the latest stable version
available.
Regards,
ismail
--
Life is a game, and if you aren't in it to win,
what the heck are you still doing here?
-- Linus Torvalds (talking about open source development)
[-- Attachment #1.2: decode-utf8.patch --]
[-- Type: text/x-diff, Size: 3063 bytes --]
--- gitweb/gitweb.perl 2007-04-24 16:53:00.000000000 +0300
+++ gitweb/gitweb.perl 2007-04-24 16:54:22.000000000 +0300
@@ -566,12 +566,6 @@
return $input;
}
-# very thin wrapper for decode("utf8", $str, Encode::FB_DEFAULT);
-sub to_utf8 {
- my $str = shift;
- return decode("utf8", $str, Encode::FB_DEFAULT);
-}
-
# quote unsafe chars, but keep the slash, even when it's not
# correct, but quoted slashes look too horrible in bookmarks
sub esc_param {
@@ -596,7 +590,7 @@
my $str = shift;
my %opts = @_;
- $str = to_utf8($str);
+ $str = decode_utf8($str);
$str = $cgi->escapeHTML($str);
if ($opts{'-nbsp'}) {
$str =~ s/ / /g;
@@ -610,7 +604,7 @@
my $str = shift;
my %opts = @_;
- $str = to_utf8($str);
+ $str = decode_utf8($str);
$str = $cgi->escapeHTML($str);
if ($opts{'-nbsp'}) {
$str =~ s/ / /g;
@@ -893,7 +887,7 @@
if (length($short) < length($long)) {
return $cgi->a({-href => $href, -class => "list subject",
- -title => to_utf8($long)},
+ -title => decode_utf8($long)},
esc_html($short) . $extra);
} else {
return $cgi->a({-href => $href, -class => "list subject"},
@@ -1110,7 +1104,7 @@
if (check_export_ok("$projectroot/$path")) {
my $pr = {
path => $path,
- owner => to_utf8($owner),
+ owner => decode_utf8($owner),
};
push @list, $pr
}
@@ -1139,7 +1133,7 @@
$pr = unescape($pr);
$ow = unescape($ow);
if ($pr eq $project) {
- $owner = to_utf8($ow);
+ $owner = decode_utf8($ow);
last;
}
}
@@ -1613,7 +1607,7 @@
}
my $owner = $gcos;
$owner =~ s/[,;].*$//;
- return to_utf8($owner);
+ return decode_utf8($owner);
}
## ......................................................................
@@ -1696,7 +1690,7 @@
my $title = "$site_name";
if (defined $project) {
- $title .= " - " . to_utf8($project);
+ $title .= " - " . decode_utf8($project);
if (defined $action) {
$title .= "/$action";
if (defined $file_name) {
@@ -1969,7 +1963,7 @@
print "<div class=\"page_path\">";
print $cgi->a({-href => href(action=>"tree", hash_base=>$hb),
- -title => 'tree root'}, to_utf8("[$project]"));
+ -title => 'tree root'}, decode_utf8("[$project]"));
print " / ";
if (defined $name) {
my @dirname = split '/', $name;
@@ -2584,7 +2578,7 @@
($pr->{'age'}, $pr->{'age_string'}) = @aa;
if (!defined $pr->{'descr'}) {
my $descr = git_get_project_description($pr->{'path'}) || "";
- $pr->{'descr_long'} = to_utf8($descr);
+ $pr->{'descr_long'} = decode_utf8($descr);
$pr->{'descr'} = chop_str($descr, 25, 5);
}
if (!defined $pr->{'owner'}) {
@@ -3616,7 +3610,7 @@
$hash = git_get_head_hash($project);
}
- my $filename = to_utf8(basename($project)) . "-$hash.tar.$suffix";
+ my $filename = decode_utf8(basename($project)) . "-$hash.tar.$suffix";
print $cgi->header(
-type => "application/$ctype",
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next reply other threads:[~2007-04-24 14:04 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-24 14:05 Ismail Dönmez [this message]
2007-04-27 8:55 ` [PATCH] gitweb: use decode_utf8 directly Ismail Dönmez
2007-04-27 9:07 ` Junio C Hamano
2007-04-27 9:22 ` Ismail Dönmez
2007-04-27 19:29 ` Junio C Hamano
2007-05-01 21:12 ` Ismail Dönmez
2007-05-01 21:39 ` Junio C Hamano
2007-05-01 21:44 ` Ismail Dönmez
2007-05-01 21:48 ` Ismail Dönmez
2007-05-03 19:22 ` Ismail Dönmez
2007-05-03 19:26 ` Junio C Hamano
2007-06-01 13:45 ` Alexandre Julliard
2007-06-01 13:50 ` Ismail Dönmez
2007-06-01 16:51 ` Alexandre Julliard
2007-06-01 19:44 ` Junio C Hamano
2007-06-01 19:47 ` Ismail Dönmez
2007-06-01 20:00 ` Junio C Hamano
2007-06-01 20:08 ` Ismail Dönmez
2007-06-03 22:06 ` Junio C Hamano
2007-06-03 22:13 ` Ismail Dönmez
2007-06-02 8:22 ` Jakub Narebski
-- strict thread matches above, loose matches on Subject: below --
2007-06-01 16:13 Martin Koegler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200704241705.19661.ismail@pardus.org.tr \
--to=ismail@pardus$(echo .)org.tr \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox