user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] git: git_unquote handles double-quote and backslash
Date: Fri, 18 Jan 2019 22:01:05 +0000	[thread overview]
Message-ID: <20190118220105.14834-1-e@80x24.org> (raw)

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 4601f25..90b9214 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 052e1ce..c642b8f 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();
-- 
EW


                 reply	other threads:[~2019-01-18 22:01 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190118220105.14834-1-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).