gitweb: Use character or octal escape codes (and add span.cntrl) in esc_path
Instead of simply hiding control characters in esc_path by replacing them with '?', use Character Escape Codes (CEC) i.e. alphabetic backslash sequences like those found in C programming language and many other languages influenced by it, such as Java and Perl. If control characted doesn't have corresponding character escape code, use octal char sequence to escape it. Alternatively, controls can be replaced with Unicode Control Pictures U+2400 - U+243F (9216 - 9279), the Unicode characters reserved for representing control characters when it is necessary to print or display them. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
403d0906e9
commit
1d3bc0cc0a
@ -584,11 +584,39 @@ sub esc_html ($;%) {
|
||||
return $str;
|
||||
}
|
||||
|
||||
# Make control characterss "printable".
|
||||
sub quot_cec {
|
||||
my $cntrl = shift;
|
||||
my %es = ( # character escape codes, aka escape sequences
|
||||
"\t" => '\t', # tab (HT)
|
||||
"\n" => '\n', # line feed (LF)
|
||||
"\r" => '\r', # carrige return (CR)
|
||||
"\f" => '\f', # form feed (FF)
|
||||
"\b" => '\b', # backspace (BS)
|
||||
"\a" => '\a', # alarm (bell) (BEL)
|
||||
"\e" => '\e', # escape (ESC)
|
||||
"\013" => '\v', # vertical tab (VT)
|
||||
"\000" => '\0', # nul character (NUL)
|
||||
);
|
||||
my $chr = ( (exists $es{$cntrl})
|
||||
? $es{$cntrl}
|
||||
: sprintf('\%03o', ord($cntrl)) );
|
||||
return "<span class=\"cntrl\">$chr</span>";
|
||||
}
|
||||
|
||||
# Alternatively use unicode control pictures codepoints.
|
||||
sub quot_upr {
|
||||
my $cntrl = shift;
|
||||
my $chr = sprintf('&#%04d;', 0x2400+ord($cntrl));
|
||||
return "<span class=\"cntrl\">$chr</span>";
|
||||
}
|
||||
|
||||
# quote control characters and escape filename to HTML
|
||||
sub esc_path {
|
||||
my $str = shift;
|
||||
|
||||
$str = esc_html($str);
|
||||
$str =~ s|([[:cntrl:]])|<span class="cntrl">?</span>|g;
|
||||
$str =~ s|([[:cntrl:]])|quot_cec($1)|eg;
|
||||
return $str;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user