From: Matthieu Moy Date: Tue, 30 Jun 2015 12:16:49 GMT Subject: [PATCH v7 08/10] send-email: consider quote as delimiter instead of character Message-ID: <1435666611-18429-9-git-send-email-Matthieu.Moy@imag.fr> In-Reply-To: <1435666611-18429-1-git-send-email-Matthieu.Moy@imag.fr> From: Remi Lespinet Do not consider quote inside a recipient name as character when they are not escaped. This interprets: "Jane" "Doe" as: "Jane Doe" instead of: "Jane\" \"Doe" Signed-off-by: Remi Lespinet Signed-off-by: Matthieu Moy --- git-send-email.perl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 4268ed9..df9d3f6 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1034,15 +1034,17 @@ sub sanitize_address { return $recipient; } + # remove non-escaped quotes + $recipient_name =~ s/(^|[^\\])"/$1/g; + # rfc2047 is needed if a non-ascii char is included if ($recipient_name =~ /[^[:ascii:]]/) { - $recipient_name =~ s/^"(.*)"$/$1/; $recipient_name = quote_rfc2047($recipient_name); } # double quotes are needed if specials or CTLs are included elsif ($recipient_name =~ /[][()<>@,;:\\".\000-\037\177]/) { - $recipient_name =~ s/(["\\\r])/\\$1/g; + $recipient_name =~ s/([\\\r])/\\$1/g; $recipient_name = qq["$recipient_name"]; } -- 2.5.0.rc0.10.g7792c2a