# [PATCH] gitweb: Do not use esc_html in esc_path
3 messages from 2006-11-25 to 2006-11-25. Participants: Jakub Narebski, Junio C Hamano.
Thread: https://gitlist.dev/t/43617
## Jakub Narebski, 2006-11-25 08:43
Subject: [PATCH] gitweb: Do not use esc_html in esc_path
Message-ID: <11644442392444-git-send-email-jnareb@gmail.com>
URL: https://gitlist.dev/e/11644442392444-git-send-email-jnareb%40gmail.com
```
Do not use esc_html in esc_path subroutine to avoid double quoting;
expand esc_html body (except quoting) in esc_path.
Move esc_path before quot_cec and quot_upr. Add some comments.
Signed-off-by: Jakub Narebski
---
This patch was send to git mailing list; I don't know if it
was missed, or rejected.
gitweb/gitweb.perl | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index ce185d9..53214b0 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -585,7 +585,21 @@ sub esc_html ($;%) {
return $str;
}
-# Make control characterss "printable".
+# quote control characters and escape filename to HTML
+sub esc_path {
+ my $str = shift;
+ my %opts = @_;
+
+ $str = to_utf8($str);
+ $str = escapeHTML($str);
+ if ($opts{'-nbsp'}) {
+ $str =~ s/ / /g;
+ }
+ $str =~ s|([[:cntrl:]])|quot_cec($1)|eg;
+ return $str;
+}
+
+# Make control characters "printable", using character escape codes (CEC)
sub quot_cec {
my $cntrl = shift;
my %es = ( # character escape codes, aka escape sequences
@@ -605,22 +619,14 @@ sub quot_cec {
return "$chr";
}
-# Alternatively use unicode control pictures codepoints.
+# Alternatively use unicode control pictures codepoints,
+# Unicode "printable representation" (PR)
sub quot_upr {
my $cntrl = shift;
my $chr = sprintf('&#%04d;', 0x2400+ord($cntrl));
return "$chr";
}
-# quote control characters and escape filename to HTML
-sub esc_path {
- my $str = shift;
-
- $str = esc_html($str);
- $str =~ s|([[:cntrl:]])|quot_cec($1)|eg;
- return $str;
-}
-
# git may return quoted and escaped filenames
sub unquote {
my $str = shift;
--
1.4.3.4
```
## Junio C Hamano, 2006-11-25 09:45
Subject: Re: [PATCH] gitweb: Do not use esc_html in esc_path
Message-ID: <7v3b876esd.fsf@assigned-by-dhcp.cox.net>
URL: https://gitlist.dev/e/7v3b876esd.fsf%40assigned-by-dhcp.cox.net
In-Reply-To: <11644442392444-git-send-email-jnareb@gmail.com>
```
Jakub Narebski writes:
> Do not use esc_html in esc_path subroutine to avoid double quoting;
> expand esc_html body (except quoting) in esc_path.
>
> Move esc_path before quot_cec and quot_upr. Add some comments.
>
> Signed-off-by: Jakub Narebski
> ---
> This patch was send to git mailing list; I don't know if it
> was missed, or rejected.
I do not remember looking at it deeply, so probably it was just
lost in the noise.
Unless there was a list discussion that was unfavorable, that
is; but I do not recall one and the patch looks sane.
```
## Jakub Narebski, 2006-11-25 09:54
Subject: Re: [PATCH] gitweb: Do not use esc_html in esc_path
Message-ID: <200611251054.04295.jnareb@gmail.com>
URL: https://gitlist.dev/e/200611251054.04295.jnareb%40gmail.com
In-Reply-To: <7v3b876esd.fsf@assigned-by-dhcp.cox.net>
```
Junio C Hamano wrote:
> Jakub Narebski writes:
>
>> ---
>> This patch was send to git mailing list; I don't know if it
>> was missed, or rejected.
>
> I do not remember looking at it deeply, so probably it was just
> lost in the noise.
>
> Unless there was a list discussion that was unfavorable, that
> is; but I do not recall one and the patch looks sane.
There was no discussion, so probably the patch was just lost in the
noise. It happens.
--
Jakub Narebski
```