From 1f042830391494f4ad48036359d2788bf0527dba Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 5 Dec 2020 19:33:52 +0530 Subject: email: Do not capture cfws in atoms and dot-atoms. * email/email.scm (define-atom-pattern): Do not capture cfws unless specified. (atom): Do not specify cfws. (define-dot-atom-pattern): Do not capture cfws. (define-word-pattern): New macro. (cfws-captured-atom, cfws-captured-word): New patterns. (obs-phrase): Use cfws-captured-word. (received-token): Capture all. (parse-mime-entity): Post process received and received-token. * tests/email.scm ("parse email headers"): Fix test. --- tests/email.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/email.scm b/tests/email.scm index d3801a9..766c402 100644 --- a/tests/email.scm +++ b/tests/email.scm @@ -110,11 +110,11 @@ X-MSMail-Priority: Normal X-mailer: FooMail 4.0 4.03 (SMT460B92F) Content-Length: 4349 ") - `((trace (received " by foo.bar.com id ZZZ55555" + `((trace (received "by foo.bar.com id ZZZ55555" ,(make-date 0 4 38 16 31 5 2001 -36000)) - (received " from ooo.ooo.com \tby foo.bar.com with ESMTP id ZZZ55555\tfor " + (received "from ooo.ooo.com by foo.bar.com with ESMTP id ZZZ55555 for " ,(make-date 0 2 38 16 31 5 2001 -36000)) - (received " from zzz by ooo.ooo.com with Maccrosoft SMTPSVC" + (received "from zzz by ooo.ooo.com with Maccrosoft SMTPSVC" ,(make-date 0 16 33 22 31 5 2001 -14400))) (message-id . "beefbeefbeefbeef@ooo.ooo.com") (subject . "Bogus Tester") -- cgit v1.2.3