cvs-syncmail-talk

[Cvs-syncmail] Patch: fix bug #592836

[Greg W. <gw...@py...>]

While I'm in the mood, here's another patch for syncmail.  This one
fixes bug #592836, which complains about syncmail generating "From:"
headers like

  From: "" <us...@so...main>

-- apparently some mail clients don't like that.  And besides, it's
ugly.  This patch fixes syncmail to only quote names when they actually
need to be quoted, ie. when they contain RFC 822 "special" characters.
This patch is relative to the "reply-to" patch I just posted.

--- syncmail.reply-to	2002-10-29 14:26:44.000000000 -0500
+++ syncmail	2002-10-29 14:36:43.000000000 -0500
@@ -219,6 +219,16 @@
 
 
 
+rfc822_specials_re = re.compile(r'[\(\)\<\>\@\,\;\:\\\"\.\[\]]')
+
+def quotename(name):
+    if name and rfc822_specials_re.search(name):
+        return '"%s"' % name.replace('"', '\\"')
+    else:
+        return name
+
+
+
 def blast_mail(subject, people, filestodiff, contextlines, fromhost, replyto):
     # cannot wait for child process or that will cause parent to retain cvs
     # lock for too long.  Urg!
@@ -236,7 +246,10 @@
         s = StringIO()
         sys.stdout = s
         try:
-            print 'From: "%s" <%s>' % (name, address)
+            if name:
+                print 'From: %s <%s>' % (quotename(name), address)
+            else:
+                print 'From: %s' % address
             print 'To: %s' % string.join(people, COMMASPACE)
             print 'Subject: %s' % subject
             if replyto:


-- 
Greg Ward <gw...@py...>                         http://www.gerg.ca/
Eschew obfuscation!

Re: [Cvs-syncmail] Patch: fix bug #592836

[<ba...@zo...>]

>>>>> "GW" == Greg Ward <gw...@py...> writes:

    GW> While I'm in the mood, here's another patch for syncmail.
    GW> This one fixes bug #592836, which complains about syncmail
    GW> generating "From:" headers like

    GW>   From: "" <us...@so...main>

    GW> -- apparently some mail clients don't like that.  And besides,
    GW> it's ugly.  This patch fixes syncmail to only quote names when
    GW> they actually need to be quoted, ie. when they contain RFC 822
    GW> "special" characters.  This patch is relative to the
    GW> "reply-to" patch I just posted.

+1

Re: [Cvs-syncmail] Patch: fix bug #592836

[Greg W. <gw...@py...>]

On 29 October 2002, I said:
> While I'm in the mood, here's another patch for syncmail.  This one
> fixes bug #592836

Here's a revised version of that patch, relative to current CVS:

--- syncmail	7 Nov 2002 15:02:10 -0000	1.22
+++ syncmail	7 Nov 2002 15:04:36 -0000
@@ -219,6 +219,16 @@
 
 
 
+rfc822_specials_re = re.compile(r'[\(\)\<\>\@\,\;\:\\\"\.\[\]]')
+
+def quotename(name):
+    if name and rfc822_specials_re.search(name):
+        return '"%s"' % name.replace('"', '\\"')
+    else:
+        return name
+
+
+
 def blast_mail(subject, people, filestodiff, contextlines, fromhost, replyto):
     # cannot wait for child process or that will cause parent to retain cvs
     # lock for too long.  Urg!
@@ -237,13 +247,13 @@
         sys.stdout = s
         try:
             vars = {'address' : address,
-                    'name'    : name,
+                    'name'    : quotename(name),
                     'people'  : string.join(people, COMMASPACE),
                     'subject' : subject,
                     'version' : __version__,
                     }
             print '''\
-From: "%(name)s" <%(address)s>
+From: %(name)s <%(address)s>
 To: %(people)s''' % vars
             if replyto:
                 print 'Reply-To: %s' % replyto


Barry already said +1 for this, so I'm going to test it out in real life
and then check this change in.

        Greg
-- 
Greg Ward <gw...@py...>                         http://www.gerg.ca/
I don't believe there really IS a GAS SHORTAGE.. I think it's all just
a BIG HOAX on the part of the plastic sign salesmen -- to sell more numbers!!