Skip to content

Commit 029f372

Browse files
ernixgitster
authored andcommitted
gitweb: apply fallback encoding before highlight
Some multi-byte character encodings (such as Shift_JIS and GBK) have characters whose final bytes is an ASCII '\' (0x5c), and they will be displayed as funny-characters even if $fallback_encoding is correct. This is because `highlight` command always expects UTF-8 encoded strings from STDIN. $ echo 'my $v = "申";' | highlight --syntax perl | w3m -T text/html -dump my $v = "申"; $ echo 'my $v = "申";' | iconv -f UTF-8 -t Shift_JIS | highlight \ --syntax perl | iconv -f Shift_JIS -t UTF-8 | w3m -T text/html -dump iconv: (stdin):9:135: cannot convert my $v = " This patch prepare git blob objects to be encoded into UTF-8 before highlighting in the manner of `to_utf8` subroutine. Signed-off-by: Shin Kojima <[email protected]> Reviewed-by: Jakub Narębski <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7654286 commit 029f372

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

gitweb/gitweb.perl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3935,6 +3935,9 @@ sub run_highlighter {
39353935

39363936
close $fd;
39373937
open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ".
3938+
quote_command($^X, '-CO', '-MEncode=decode,FB_DEFAULT', '-pse',
3939+
'$_ = decode($fe, $_, FB_DEFAULT) if !utf8::decode($_);',
3940+
'--', "-fe=$fallback_encoding")." | ".
39383941
quote_command($highlight_bin).
39393942
" --replace-tabs=8 --fragment --syntax $syntax |"
39403943
or die_error(500, "Couldn't open file or run syntax highlighter");

0 commit comments

Comments
 (0)