From: İsmail Dönmez <ismail@pardus.org.tr>
Date: Tue, 4 Dec 2007 08:55:41 +0000 (+0200)
Subject: gitweb: use Perl built-in utf8 function for UTF-8 decoding.
X-Git-Tag: v1.5.4-rc0~82
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e5d3de5c457d1a82c921b9bf2cd9a962970ce30e;p=git.git

gitweb: use Perl built-in utf8 function for UTF-8 decoding.

Signed-off-by: İsmail Dönmez <ismail@pardus.org.tr>
Tested-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index ff5daa790..24b31582a 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -695,10 +695,9 @@ sub validate_refname {
 # in utf-8 thanks to "binmode STDOUT, ':utf8'" at beginning
 sub to_utf8 {
 	my $str = shift;
-	my $res;
-	eval { $res = decode_utf8($str, Encode::FB_CROAK); };
-	if (defined $res) {
-		return $res;
+	if (utf8::valid($str)) {
+		utf8::decode($str);
+		return $str;
 	} else {
 		return decode($fallback_encoding, $str, Encode::FB_DEFAULT);
 	}