sisimai 4.22.3 → 4.22.4

data/lib/sisimai/bite/email/sendmail.rb

@@ -6,27 +6,21 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Sendmail.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from    => %r/\AMail Delivery Subsystem/,
-        :subject => %r/(?:see transcript for details\z|\AWarning: )/,
-      }.freeze
-      # Error text regular expressions which defined in sendmail/savemail.c
-      #   savemail.c:1040|if (printheader && !putline("   ----- Transcript of session follows -----\n",
-      #   savemail.c:1041|          mci))
-      #   savemail.c:1042|  goto writeerr;
-      #
-      Re1 = {
-        :begin   => %r/\A[ \t]+[-]+ Transcript of session follows [-]+\z/,
-        :error   => %r/\A[.]+ while talking to .+[:]\z/,
-        :rfc822  => %r{\AContent-Type:[ ]*(?:message/rfc822|text/rfc822-headers)\z},
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        # Error text regular expressions which defined in sendmail/savemail.c
+        #   savemail.c:1040|if (printheader && !putline("   ----- Transcript of session follows -----\n",
+        #   savemail.c:1041|          mci))
+        #   savemail.c:1042|  goto writeerr;
+        #
+        rfc822:  ['Content-Type: message/rfc822', 'Content-Type: text/rfc822-headers'],
+        message: ['   ----- Transcript of session follows -----'],
+        error:   ['... while talking to '],
+      }.freeze
 
       def description; return 'V8Sendmail: /usr/sbin/sendmail'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Sendmail
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -42,12 +36,12 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil unless mhead['subject'] =~ Re0[:subject]
 
-        unless mhead['subject'] =~ /\A[ \t]*Fwd?:/i
+        return nil unless mhead['subject'] =~ /(?:see transcript for details\z|\AWarning: )/
+        unless mhead['subject'].downcase =~ /\A[ \t]*fwd?:/
           # Fwd: Returned mail: see transcript for details
           # Do not execute this code if the bounce mail is a forwarded message.
-          return nil unless mhead['from'] =~ Re0[:from]
+          return nil unless mhead['from'].start_with?('Mail Delivery Subsystem')
         end
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -68,14 +62,14 @@ module Sisimai::Bite::Email
         anotherset = {}     # Another error information
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           # Save the current line for the next loop
           havepassed << e
           p = havepassed[-2]
 
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -83,7 +77,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e.start_with?(StartingOf[:rfc822][0], StartingOf[:rfc822][1])
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -97,7 +91,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -113,7 +106,7 @@ module Sisimai::Bite::Email
               # Last-Attempt-Date: Fri, 14 Feb 2014 12:30:08 -0500
               v = dscontents[-1]
 
-              if cv = e.match(/\A[Ff]inal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+              if cv = e.match(/\AFinal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
                 # Final-Recipient: RFC822; userunknown@example.jp
                 if v['recipient']
                   # There are multiple recipient addresses in the message body.
@@ -123,43 +116,40 @@ module Sisimai::Bite::Email
                 v['recipient'] = cv[1]
                 recipients += 1
 
-              elsif cv = e.match(/\A[Xx]-[Aa]ctual-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+              elsif cv = e.match(/\AX-Actual-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
                 # X-Actual-Recipient: RFC822; kijitora@example.co.jp
                 v['alias'] = cv[1]
 
-              elsif cv = e.match(/\A[Aa]ction:[ ]*(.+)\z/)
+              elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
                 # Action: failed
                 v['action'] = cv[1].downcase
 
-              elsif cv = e.match(/\A[Ss]tatus:[ ]*(\d[.]\d+[.]\d+)/)
+              elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
                 # Status: 5.1.1
                 # Status:5.2.0
                 # Status: 5.1.0 (permanent failure)
                 v['status'] = cv[1]
 
-              elsif cv = e.match(/\A[Rr]emote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              elsif cv = e.match(/\ARemote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                 # Remote-MTA: DNS; mx.example.jp
                 v['rhost'] = cv[1].downcase
                 v['rhost'] = '' if v['rhost'] =~ /\A\s+\z/  # Remote-MTA: DNS;
 
-              elsif cv = e.match(/\A[Ll]ast-[Aa]ttempt-[Dd]ate:[ ]*(.+)\z/)
+              elsif cv = e.match(/\ALast-Attempt-Date:[ ]*(.+)\z/)
                 # Last-Attempt-Date: Fri, 14 Feb 2014 12:30:08 -0500
                 v['date'] = cv[1]
-
               else
-                if cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+?);[ ]*(.+)\z/)
+                if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
                   # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
                   v['spec'] = cv[1].upcase
                   v['diagnosis'] = cv[2]
 
-                elsif p =~ /\A[Dd]iagnostic-[Cc]ode:[ ]*/ && cv = e.match(/\A[ \t]+(.+)\z/)
+                elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
                   # Continued line of the value of Diagnostic-Code header
-                  v['diagnosis'] ||= ''
-                  v['diagnosis']  += ' ' + cv[1]
-                  havepassed[-1] = 'Diagnostic-Code: ' + e
+                  v['diagnosis'] << ' ' << cv[1]
+                  havepassed[-1] = 'Diagnostic-Code: ' << e
                 end
               end
-
             else
               # ----- Transcript of session follows -----
               # ... while talking to mta.example.org.:
@@ -178,13 +168,13 @@ module Sisimai::Bite::Email
                 # <<< Response
                 esmtpreply = cv[1]
 
-              elsif cv = e.match(/\A[Rr]eporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              elsif cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                 # Reporting-MTA: dns; mx.example.jp
                 next if connheader['rhost'].size > 0
                 connheader['rhost'] = cv[1].downcase
                 connvalues += 1
 
-              elsif cv = e.match(/\A[Rr]eceived-[Ff]rom-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              elsif cv = e.match(/\AReceived-From-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                 # Received-From-MTA: DNS; x1x2x3x4.dhcp.example.ne.jp
                 next if connheader['lhost']
 
@@ -192,16 +182,15 @@ module Sisimai::Bite::Email
                 connheader['lhost'] = cv[1].downcase
                 connvalues += 1
 
-              elsif cv = e.match(/\A[Aa]rrival-[Dd]ate:[ ]*(.+)\z/)
+              elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
                 # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
                 next if connheader['date'].size > 0
                 connheader['date'] = cv[1]
                 connvalues += 1
-
               else
                 # Detect SMTP session error or connection error
                 next if sessionerr
-                if e =~ Re1[:error]
+                if e.start_with?(StartingOf[:error][0])
                   # ----- Transcript of session follows -----
                   # ... while talking to mta.example.org.:
                   sessionerr = true
@@ -212,7 +201,6 @@ module Sisimai::Bite::Email
                   # <kijitora@example.co.jp>... Deferred: Name server: example.co.jp.: host name lookup failure
                   anotherset['recipient'] = cv[1]
                   anotherset['diagnosis'] = cv[2]
-
                 else
                   # ----- Transcript of session follows -----
                   # Message could not be delivered for too long
@@ -225,13 +213,13 @@ module Sisimai::Bite::Email
                     # 554 5.3.0 unknown mailer error 255
                     anotherset['status'] = cv[1]
                     anotherset['diagnosis'] ||= ''
-                    anotherset['diagnosis']  += ' ' + e
+                    anotherset['diagnosis'] << ' ' << e
 
-                  elsif e =~ /\A(?:Message|Warning:) /
+                  elsif e.start_with?('Message ', 'Warning: ')
                     # Message could not be delivered for too long
                     # Warning: message still undelivered after 4 hours
                     anotherset['diagnosis'] ||= ''
-                    anotherset['diagnosis'] += ' ' + e
+                    anotherset['diagnosis'] << ' ' << e
                   end
                 end
               end
@@ -239,8 +227,8 @@ module Sisimai::Bite::Email
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
@@ -255,11 +243,7 @@ module Sisimai::Bite::Email
             # Copy alternative error message
             e['diagnosis'] = anotherset['diagnosis'] if e['diagnosis'] =~ /\A[ \t]+\z/
             e['diagnosis'] = anotherset['diagnosis'] unless e['diagnosis']
-
-            if e['diagnosis'] =~ /\A\d+\z/
-              # Override the value of diagnostic code message
-              e['diagnosis'] = anotherset['diagnosis']
-            end
+            e['diagnosis'] = anotherset['diagnosis'] if e['diagnosis'] =~ /\A\d+\z/
           end
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 

data/lib/sisimai/bite/email/surfcontrol.rb

@@ -7,17 +7,11 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/SurfControl.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :'from'     => %r/ [(]Mail Delivery System[)]\z/,
-        :'x-mailer' => %r/\ASurfControl E-mail Filter\z/,
-      }.freeze
-      Re1 = {
-        :begin  => %r/\AYour message could not be sent[.]\z/,
-        :error  => %r/\AFailed to send to identified host,\z/,
-        :rfc822 => %r|\AContent-Type: message/rfc822\z|,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['Your message could not be sent.'],
+        rfc822:  ['Content-Type: message/rfc822'],
+      }.freeze
 
       def description; return 'WebSense SurfControl'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -25,7 +19,6 @@ module Sisimai::Bite::Email
       # X-SEF-Processed: 0_0_0_000__2010_04_29_23_34_45
       # X-Mailer: SurfControl E-mail Filter
       def headerlist;  return ['X-SEF-Processed', 'X-Mailer']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from SurfControl
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -41,9 +34,11 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
+
+        # :'from' => %r/ [(]Mail Delivery System[)]\z/,
         return nil unless mhead['x-sef-processed']
         return nil unless mhead['x-mailer']
-        return nil unless mhead['x-mailer'] =~ Re0[:'x-mailer']
+        return nil unless mhead['x-mailer'] == 'SurfControl E-mail Filter'
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -54,14 +49,14 @@ module Sisimai::Bite::Email
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           # Save the current line for the next loop
           havepassed << e
           p = havepassed[-2]
 
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e == StartingOf[:message][0]
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -69,7 +64,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e == StartingOf[:rfc822][0]
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -83,7 +78,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -118,25 +112,23 @@ module Sisimai::Bite::Email
               # kijitora@example.com: [192.0.2.5], 550 kijitora@example.com... No such user
               v['rhost'] = cv[1]
               v['diagnosis'] = cv[2]
-
             else
               # Fallback, parse RFC3464 headers.
-              if cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+?);[ ]*(.+)\z/)
+              if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
                 # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
                 v['spec'] = cv[1].upcase
                 v['diagnosis'] = cv[2]
 
-              elsif p =~ /\A[Dd]iagnostic-[Cc]ode:[ ]*/ && cv = e.match(/\A[ ]+(.+)\z/)
+              elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ ]+(.+)\z/)
                 # Continued line of the value of Diagnostic-Code header
-                v['diagnosis'] ||= ''
-                v['diagnosis']  += ' ' + cv[1]
-                havepassed[-1] = 'Diagnostic-Code: ' + e
+                v['diagnosis'] << ' ' << cv[1]
+                havepassed[-1] = 'Diagnostic-Code: ' << e
 
-              elsif cv = e.match(/\A[Aa]ction:[ ]*(.+)\z/)
+              elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
                 # Action: failed
                 v['action'] = cv[1].downcase
 
-              elsif cv = e.match(/\A[Ss]tatus:[ ]*(\d[.]\d+[.]\d+)/)
+              elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
                 # Status: 5.0.-
                 v['status'] = cv[1]
               end
@@ -144,8 +136,8 @@ module Sisimai::Bite::Email
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])

data/lib/sisimai/bite/email/userdefined.rb

@@ -6,31 +6,22 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/UserDefined.pm
       require 'sisimai/bite/email'
 
-      # Re0 is a regular expression to match with message headers which are
-      # given as the first argument of scan() method.
-      Re0 = {
-        :from    => %r/\AMail Sysmet/,
-        :subject => %r/\AError Mail Report/,
-      }.freeze
-
-      # Re1 is delimiter set of these sections:
-      #   begin:  The first line of a bounce message to be parsed.
-      #   error:  The first line of an error message to get an error reason, recipient
-      #           addresses, or other bounce information.
-      #   rfc822: The first line of the original message.
-      #   endof:  Fixed string ``__END_OF_EMAIL_MESSAGE__''
-      Re1 = {
-        :begin   => %r/\A[ \t]+[-]+ Transcript of session follows [-]+\z/,
-        :error   => %r/\A[.]+ while talking to .+[:]\z/,
-        :rfc822  => %r{\AContent-Type:[ ]*(?:message/rfc822|text/rfc822-headers)\z},
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      MarkingsOf = {
+        # MarkingsOf is a delimiter set of these sections:
+        #   message: The first line of a bounce message to be parsed.
+        #   error:   The first line of an error message to get an error reason, recipient
+        #            addresses, or other bounce information.
+        #   rfc822:  The first line of the original message.
+        #   endof:   Fixed string ``__END_OF_EMAIL_MESSAGE__''
+        message: %r/\A[ \t]+[-]+ Transcript of session follows [-]+\z/,
+        error:   %r/\A[.]+ while talking to .+[:]\z/,
+        rfc822:  %r{\AContent-Type:[ ]*(?:message/rfc822|text/rfc822-headers)\z},
+      }.freeze
 
       def description; return 'Module description'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return ['X-Some-UserDefined-Header']; end
-      def pattern;     return Re0; end
 
       # @abstract Template for User-Defined MTA module
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -47,14 +38,14 @@ module Sisimai::Bite::Email
         return nil unless mhead
         return nil unless mbody
 
-        match = 0
         # 1. Check some value in mhead using regular expression or "==" operator
         #    whether the bounce message should be parsed by this module or not.
         #   - Matched 1 or more values: Proceed to the step 2.
         #   - Did not matched:          return nil
         #
-        match += 1 if mhead['subject'] =~ Re0[:subject]
-        match += 1 if mhead['from']    =~ Re0[:from]
+        match  = 0
+        match += 1 if mhead['subject'].start_with?('Error Mail Report')
+        match += 1 if mhead['from'].include?('Mail System')
         match += 1 if mhead['x-some-userdefined-header']
         return nil if match.zero?
 
@@ -67,10 +58,10 @@ module Sisimai::Bite::Email
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e =~ MarkingsOf[:message]
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -78,7 +69,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e =~ MarkingsOf[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -92,12 +83,10 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
             next if e.empty?
-
           end
         end
 

data/lib/sisimai/bite/email/v5sendmail.rb

@@ -7,42 +7,36 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/V5sendmail.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from    => %r/\AMail Delivery Subsystem/,
-        :subject => %r/\AReturned mail: [A-Z]/,
-      }.freeze
-      # Error text regular expressions which defined in src/savemail.c
-      #   savemail.c:485| (void) fflush(stdout);
-      #   savemail.c:486| p = queuename(e->e_parent, 'x');
-      #   savemail.c:487| if ((xfile = fopen(p, "r")) == NULL)
-      #   savemail.c:488| {
-      #   savemail.c:489|   syserr("Cannot open %s", p);
-      #   savemail.c:490|   fprintf(fp, "  ----- Transcript of session is unavailable -----\n");
-      #   savemail.c:491| }
-      #   savemail.c:492| else
-      #   savemail.c:493| {
-      #   savemail.c:494|   fprintf(fp, "   ----- Transcript of session follows -----\n");
-      #   savemail.c:495|   if (e->e_xfp != NULL)
-      #   savemail.c:496|       (void) fflush(e->e_xfp);
-      #   savemail.c:497|   while (fgets(buf, sizeof buf, xfile) != NULL)
-      #   savemail.c:498|       putline(buf, fp, m);
-      #   savemail.c:499|   (void) fclose(xfile);
-      Re1 = {
-        :begin  => %r/\A[ \t]+[-]+ Transcript of session follows [-]+\z/,
-        :error  => %r/\A[.]+ while talking to .+[:]\z/,
-        :rfc822 => %r{\A[ \t]+-----[ ](?:
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = { message: ['----- Transcript of session follows -----'] };
+      MarkingsOf = {
+        # Error text regular expressions which defined in src/savemail.c
+        #   savemail.c:485| (void) fflush(stdout);
+        #   savemail.c:486| p = queuename(e->e_parent, 'x');
+        #   savemail.c:487| if ((xfile = fopen(p, "r")) == NULL)
+        #   savemail.c:488| {
+        #   savemail.c:489|   syserr("Cannot open %s", p);
+        #   savemail.c:490|   fprintf(fp, "  ----- Transcript of session is unavailable -----\n");
+        #   savemail.c:491| }
+        #   savemail.c:492| else
+        #   savemail.c:493| {
+        #   savemail.c:494|   fprintf(fp, "   ----- Transcript of session follows -----\n");
+        #   savemail.c:495|   if (e->e_xfp != NULL)
+        #   savemail.c:496|       (void) fflush(e->e_xfp);
+        #   savemail.c:497|   while (fgets(buf, sizeof buf, xfile) != NULL)
+        #   savemail.c:498|       putline(buf, fp, m);
+        #   savemail.c:499|   (void) fclose(xfile);
+        error:   %r/\A[.]+ while talking to .+[:]\z/,
+        rfc822:  %r{\A[ \t]+-----[ ](?:
            Unsent[ ]message[ ]follows
           |No[ ]message[ ]was[ ]collected
           )[ ]-----
         }x,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Sendmail version 5'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Sendmail version 5
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -58,7 +52,9 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil unless mhead['subject'] =~ Re0[:subject]
+
+        # :from => %r/\AMail Delivery Subsystem/,
+        return nil unless mhead['subject'] =~ /\AReturned mail: [A-Z]/
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -72,10 +68,10 @@ module Sisimai::Bite::Email
         errorindex = -1     # (Integer)
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e.include?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -83,7 +79,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e =~ MarkingsOf[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -97,7 +93,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -121,11 +116,8 @@ module Sisimai::Bite::Email
               v['recipient'] = cv[1]
               v['diagnosis'] = cv[2]
 
-              if responding[recipients]
-                # Concatenate the response of the server and error message
-                v['diagnosis'] ||= ''
-                v['diagnosis']  += ': ' + responding[recipients]
-              end
+              # Concatenate the response of the server and error message
+              v['diagnosis'] << ': ' << responding[recipients] if responding[recipients]
               recipients += 1
 
             elsif cv = e.match(/\A[>]{3}[ ]*([A-Z]{4})[ ]*/)
@@ -137,12 +129,11 @@ module Sisimai::Bite::Email
               # <<< 501 <shironeko@example.co.jp>... no access from mail server [192.0.2.55] which is an open relay.
               # <<< 550 Requested User Mailbox not found. No such user here.
               responding[recipients] = cv[1]
-
             else
               # Detect SMTP session error or connection error
               next if v['sessionerr']
 
-              if e =~ Re1[:error]
+              if e =~ MarkingsOf[:error]
                 # ----- Transcript of session follows -----
                 # ... while talking to mta.example.org.:
                 v['sessionerr'] = true
@@ -170,14 +161,14 @@ module Sisimai::Bite::Email
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           errorindex += 1
           e['agent']   = self.smtpagent
           e['command'] = commandset[errorindex] || ''
 
-          e['diagnosis'] ||= if anotherset['diagnosis'] && anotherset['diagnosis'].size > 0
+          e['diagnosis'] ||= if anotherset['diagnosis'].to_s.size > 0
                                # Copy alternative error message
                                anotherset['diagnosis']
                              else