From c22651c2da862ba829dc037e18d726193e4bcbcd Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 18 Jan 2019 12:50:59 +0000 Subject: git: git_unquote handles double-quote and backslash We need to work with 0x22 (double-quote) and 0x5c (backslash); even if they're oddball characters in filenames which wouldn't be used by projects I'd want to work on. --- lib/PublicInbox/Git.pm | 4 +++- t/git.t | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm index 4601f259..90b9214a 100644 --- a/lib/PublicInbox/Git.pm +++ b/lib/PublicInbox/Git.pm @@ -23,13 +23,15 @@ my %GIT_ESC = ( r => "\r", t => "\t", v => "\013", + '"' => '"', + '\\' => '\\', ); # unquote pathnames used by git, see quote.c::unquote_c_style.c in git.git sub git_unquote ($) { return $_[0] unless ($_[0] =~ /\A"(.*)"\z/); $_[0] = $1; - $_[0] =~ s/\\([abfnrtv])/$GIT_ESC{$1}/g; + $_[0] =~ s/\\([\\"abfnrtv])/$GIT_ESC{$1}/g; $_[0] =~ s/\\([0-7]{1,3})/chr(oct($1))/ge; $_[0]; } diff --git a/t/git.t b/t/git.t index 052e1cec..c642b8fe 100644 --- a/t/git.t +++ b/t/git.t @@ -148,5 +148,7 @@ use_ok 'PublicInbox::Git', qw(git_unquote); my $s; is("foo\nbar", git_unquote($s = '"foo\\nbar"'), 'unquoted newline'); is("Eléanor", git_unquote($s = '"El\\303\\251anor"'), 'unquoted octal'); +is(git_unquote($s = '"I\"m"'), 'I"m', 'unquoted dq'); +is(git_unquote($s = '"I\\m"'), 'I\\m', 'unquoted backslash'); done_testing(); -- cgit v1.2.3-24-ge0c7