* [PATCH] send-email: extend sanitize_address_rfc822 to do rfc2047 quoting
@ 2007-07-10 17:02 Uwe Kleine-König
2007-07-10 17:02 ` [PATCH] [RFC] send-email: honor --suppress-from --signed-off-cc Uwe Kleine-König
2007-07-11 8:42 ` [PATCH] send-email: extend sanitize_address_rfc822 to do rfc2047 quoting Sven Verdoolaege
0 siblings, 2 replies; 7+ messages in thread
From: Uwe Kleine-König @ 2007-07-10 17:02 UTC (permalink / raw
To: git; +Cc: Uwe Kleine-König
Without this patch I'm not able to properly send emails as I have a
non-ascii character in my name.
Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
---
As I'm not a perl profi, someone wants to check this code.
Actually this series is a test, as it is sended with the patched send-email.
I hope it works :-)
Uwe
git-send-email.perl | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 89f7c36..8b3d450 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -459,16 +459,30 @@ sub unquote_rfc2047 {
return "$_";
}
-# If an address contains a . in the name portion, the name must be quoted.
+# If an address contains a non-ascii char in the name port, quote it according
+# to rfc2047.
+# If an address contains a . in the name portion, the name must be quoted using
+# double quotes.
sub sanitize_address_rfc822
{
my ($recipient) = @_;
- my ($recipient_name) = ($recipient =~ /^(.*?)\s+</);
+ my ($recipient_name, $recipient_addr) = ($recipient =~ /^(.*?)(\s+<.*)/);
+
+ if ($recipient_name && $recipient_name =~ /[^-a-zA-Z0-9!*+\/ ]/ && $recipient_name !~ /=\?utf-8\?q?.*\?=/) {
+ $recipient_name =~ s/([^-a-zA-Z0-9!*+ ])/sprintf("=%02X", ord($1))/eg;
+ $recipient_name =~ s/ /_/;
+ $recipient_name =~ s/(.*)/=\?utf-8\?q\?$1\?=/;
+ }
+
if ($recipient_name && $recipient_name =~ /\./ && $recipient_name !~ /^".*"$/) {
- my ($name, $addr) = ($recipient =~ /^(.*?)(\s+<.*)/);
- $recipient = "\"$name\"$addr";
+ $recipient_name = "\"$recipient_name\"";
+ }
+
+ if ($recipient_name) {
+ return "$recipient_name$recipient_addr";
+ } else {
+ return "$recipient";
}
- return $recipient;
}
sub send_message
--
1.5.3.rc0.823.gdedbf
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] [RFC] send-email: honor --suppress-from --signed-off-cc
2007-07-10 17:02 [PATCH] send-email: extend sanitize_address_rfc822 to do rfc2047 quoting Uwe Kleine-König
@ 2007-07-10 17:02 ` Uwe Kleine-König
2007-07-11 7:55 ` Uwe Kleine-König
2007-07-11 8:42 ` [PATCH] send-email: extend sanitize_address_rfc822 to do rfc2047 quoting Sven Verdoolaege
1 sibling, 1 reply; 7+ messages in thread
From: Uwe Kleine-König @ 2007-07-10 17:02 UTC (permalink / raw
To: git; +Cc: Uwe Kleine-König
From: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
---
Not sure, if this is how it should be. Maybe we need another flag?
Best regards
Uwe
git-send-email.perl | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 8b3d450..a03153b 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -641,9 +641,11 @@ foreach my $t (@files) {
if (/^(Signed-off-by|Cc): (.*)$/i && $signed_off_cc) {
my $c = $2;
chomp $c;
- push @cc, $c;
- printf("(sob) Adding cc: %s from line '%s'\n",
- $c, $_) unless $quiet;
+ if (!$suppress_from or $c eq $from) {
+ push @cc, $c;
+ printf("(sob) Adding cc: %s from line '%s'\n",
+ $c, $_) unless $quiet;
+ }
}
}
}
--
1.5.3.rc0.823.gdedbf
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] [RFC] send-email: honor --suppress-from --signed-off-cc
2007-07-10 17:02 ` [PATCH] [RFC] send-email: honor --suppress-from --signed-off-cc Uwe Kleine-König
@ 2007-07-11 7:55 ` Uwe Kleine-König
0 siblings, 0 replies; 7+ messages in thread
From: Uwe Kleine-König @ 2007-07-11 7:55 UTC (permalink / raw
To: git
Hello,
please forget that second patch, it was sent with a dirty send-email and
even that was wrong. The first patch however is IMHO a good one.
I will look again into my issues with send-email probably next week.
Best regards
Uwe
--
Uwe Kleine-König
http://www.google.com/search?q=5%2B7
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] send-email: extend sanitize_address_rfc822 to do rfc2047 quoting
2007-07-10 17:02 [PATCH] send-email: extend sanitize_address_rfc822 to do rfc2047 quoting Uwe Kleine-König
2007-07-10 17:02 ` [PATCH] [RFC] send-email: honor --suppress-from --signed-off-cc Uwe Kleine-König
@ 2007-07-11 8:42 ` Sven Verdoolaege
2007-07-11 11:49 ` Uwe Kleine-König
1 sibling, 1 reply; 7+ messages in thread
From: Sven Verdoolaege @ 2007-07-11 8:42 UTC (permalink / raw
To: Uwe Kleine-König; +Cc: git
On Tue, Jul 10, 2007 at 07:02:43PM +0200, Uwe Kleine-König wrote:
> my ($recipient) = @_;
> - my ($recipient_name) = ($recipient =~ /^(.*?)\s+</);
> + my ($recipient_name, $recipient_addr) = ($recipient =~ /^(.*?)(\s+<.*)/);
> +
> + if ($recipient_name && $recipient_name =~ /[^-a-zA-Z0-9!*+\/ ]/ && $recipient_name !~ /=\?utf-8\?q?.*\?=/) {
Why the extra test for truthness of $recipient_name ?
> if ($recipient_name && $recipient_name =~ /\./ && $recipient_name !~ /^".*"$/) {
> - my ($name, $addr) = ($recipient =~ /^(.*?)(\s+<.*)/);
> - $recipient = "\"$name\"$addr";
> + $recipient_name = "\"$recipient_name\"";
> + }
> +
> + if ($recipient_name) {
> + return "$recipient_name$recipient_addr";
> + } else {
> + return "$recipient";
> }
> - return $recipient;
Why did you introduce interpolation just to get $recipient again?
Then again, why do you need a test at all here?
return $recipient_name . $recipient_addr;
should work, no?
skimo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] send-email: extend sanitize_address_rfc822 to do rfc2047 quoting
2007-07-11 8:42 ` [PATCH] send-email: extend sanitize_address_rfc822 to do rfc2047 quoting Sven Verdoolaege
@ 2007-07-11 11:49 ` Uwe Kleine-König
2007-07-11 12:08 ` Sven Verdoolaege
[not found] ` <81b0412b0707110538s7eda05e8g6973e20fc4d91931@mail.gmail.com>
0 siblings, 2 replies; 7+ messages in thread
From: Uwe Kleine-König @ 2007-07-11 11:49 UTC (permalink / raw
To: skimo; +Cc: git
Sven Verdoolaege wrote:
> On Tue, Jul 10, 2007 at 07:02:43PM +0200, Uwe Kleine-König wrote:
> > my ($recipient) = @_;
> > - my ($recipient_name) = ($recipient =~ /^(.*?)\s+</);
> > + my ($recipient_name, $recipient_addr) = ($recipient =~ /^(.*?)(\s+<.*)/);
> > +
> > + if ($recipient_name && $recipient_name =~ /[^-a-zA-Z0-9!*+\/ ]/ && $recipient_name !~ /=\?utf-8\?q?.*\?=/) {
>
> Why the extra test for truthness of $recipient_name ?
Try:
my $recipient = 'skimo@kotnet.org';
my ($recipient_name, $recipient_addr) = ($recipient =~ /^(.*?)(\s+<.*)/);
print "Hoppla\n" if (!$recipient_name);
i.e. if the pattern doesn't match, recipient_name is undefined.
But the function could be simplyfied anyhow. e.g.
if ($recipient_name) {
... do all the quoting ...
return "$recipient_name$recipient_addr";
} else {
return $recipient;
}
Best regards
Uwe
--
Uwe Kleine-König
http://www.google.com/search?q=square+root+of+2
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] send-email: extend sanitize_address_rfc822 to do rfc2047 quoting
2007-07-11 11:49 ` Uwe Kleine-König
@ 2007-07-11 12:08 ` Sven Verdoolaege
[not found] ` <81b0412b0707110538s7eda05e8g6973e20fc4d91931@mail.gmail.com>
1 sibling, 0 replies; 7+ messages in thread
From: Sven Verdoolaege @ 2007-07-11 12:08 UTC (permalink / raw
To: Uwe Kleine-König, git
On Wed, Jul 11, 2007 at 01:49:09PM +0200, Uwe Kleine-König wrote:
> Sven Verdoolaege wrote:
> > On Tue, Jul 10, 2007 at 07:02:43PM +0200, Uwe Kleine-König wrote:
> > > my ($recipient) = @_;
> > > - my ($recipient_name) = ($recipient =~ /^(.*?)\s+</);
> > > + my ($recipient_name, $recipient_addr) = ($recipient =~ /^(.*?)(\s+<.*)/);
> > > +
> > > + if ($recipient_name && $recipient_name =~ /[^-a-zA-Z0-9!*+\/ ]/ && $recipient_name !~ /=\?utf-8\?q?.*\?=/) {
> >
> > Why the extra test for truthness of $recipient_name ?
>
> i.e. if the pattern doesn't match, recipient_name is undefined.
I know. I just didn't realize git-send-email was run with -w.
Sorry for the noise.
skimo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] send-email: extend sanitize_address_rfc822 to do rfc2047 quoting
[not found] ` <81b0412b0707110538s7eda05e8g6973e20fc4d91931@mail.gmail.com>
@ 2007-07-11 12:49 ` Sven Verdoolaege
0 siblings, 0 replies; 7+ messages in thread
From: Sven Verdoolaege @ 2007-07-11 12:49 UTC (permalink / raw
To: Alex Riesen; +Cc: Uwe Kleine-König, git
On Wed, Jul 11, 2007 at 02:38:11PM +0200, Alex Riesen wrote:
> On 7/11/07, Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> wrote:
> >Try:
> >
> > my $recipient = 'skimo@kotnet.org';
> > my ($recipient_name, $recipient_addr) = ($recipient =~
> > /^(.*?)(\s+<.*)/);
> > print "Hoppla\n" if (!$recipient_name);
>
> Still wrong. Try it on "0 <0user@buildhost.localnet>"
I was going to suggest using defined($recipient_name) to make it clear,
but it won't affect correctness as "0" won't match the regexps in
sanitize_address_rfc822 anyway.
skimo
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2007-07-11 12:49 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-10 17:02 [PATCH] send-email: extend sanitize_address_rfc822 to do rfc2047 quoting Uwe Kleine-König
2007-07-10 17:02 ` [PATCH] [RFC] send-email: honor --suppress-from --signed-off-cc Uwe Kleine-König
2007-07-11 7:55 ` Uwe Kleine-König
2007-07-11 8:42 ` [PATCH] send-email: extend sanitize_address_rfc822 to do rfc2047 quoting Sven Verdoolaege
2007-07-11 11:49 ` Uwe Kleine-König
2007-07-11 12:08 ` Sven Verdoolaege
[not found] ` <81b0412b0707110538s7eda05e8g6973e20fc4d91931@mail.gmail.com>
2007-07-11 12:49 ` Sven Verdoolaege
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.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).