From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.4 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Jakub Narebski Subject: [PATCH] gitweb: Do not use esc_html in esc_path Date: Sat, 25 Nov 2006 09:43:59 +0100 Message-ID: <11644442392444-git-send-email-jnareb@gmail.com> NNTP-Posting-Date: Sat, 25 Nov 2006 08:42:34 +0000 (UTC) Cc: Jakub Narebski Return-path: Envelope-to: gcvg-git@gmane.org DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:from:to:cc:subject:date:message-id:x-mailer; b=dA7XzLdKz83ZI/T92Ntmo1lmtxqXZdiq6q56rP0Qy5DaRsbxpyuQ18b/5Ju8C0tQH5MSRnAPOgku3g//aVujsMhqsgIRoeyQaOxhmB2YMGpXYAP/F8cJX98eQS2ThoZitjTp1fM15cDTWePuic6gLWR+Lv/jXJvsoPG1aV+lHxY= X-Mailer: git-send-email 1.4.4.1 Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Gnt7B-0004HI-W8 for gcvg-git@gmane.org; Sat, 25 Nov 2006 09:42:26 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933667AbWKYImX (ORCPT ); Sat, 25 Nov 2006 03:42:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933985AbWKYImX (ORCPT ); Sat, 25 Nov 2006 03:42:23 -0500 Received: from ug-out-1314.google.com ([66.249.92.169]:57424 "EHLO ug-out-1314.google.com") by vger.kernel.org with ESMTP id S933667AbWKYImW (ORCPT ); Sat, 25 Nov 2006 03:42:22 -0500 Received: by ug-out-1314.google.com with SMTP id 44so819798uga for ; Sat, 25 Nov 2006 00:42:21 -0800 (PST) Received: by 10.67.121.15 with SMTP id y15mr5855007ugm.1164444141047; Sat, 25 Nov 2006 00:42:21 -0800 (PST) Received: from roke.D-201 ( [81.190.24.209]) by mx.google.com with ESMTP id y7sm15893527ugc.2006.11.25.00.42.20; Sat, 25 Nov 2006 00:42:20 -0800 (PST) Received: from roke.D-201 (localhost.localdomain [127.0.0.1]) by roke.D-201 (8.13.4/8.13.4) with ESMTP id kAP8hxhQ009065; Sat, 25 Nov 2006 09:44:00 +0100 Received: (from jnareb@localhost) by roke.D-201 (8.13.4/8.13.4/Submit) id kAP8hx7B009064; Sat, 25 Nov 2006 09:43:59 +0100 To: git@vger.kernel.org Sender: git-owner@vger.kernel.org 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