[SCM] GNU Mailutils branch, master, updated. release-2.2-483-g806f824

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=806f824c26af5389ddd0cfa4d479a6f6454e28b1

The branch, master has been updated
       via  806f824c26af5389ddd0cfa4d479a6f6454e28b1 (commit)
       via  b3e5945c1432efd96a6bc80d5b0031d5ea4ddde3 (commit)
      from  759cf45adacfe54b505ad7deebf3e54602ce46f0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 806f824c26af5389ddd0cfa4d479a6f6454e28b1
Author: Sergey Poznyakoff <address@hidden>
Date:   Mon Nov 28 21:46:23 2011 +0200

    Update ignored file list.
    
    * scheme/.gitignore: Update

commit b3e5945c1432efd96a6bc80d5b0031d5ea4ddde3
Author: Sergey Poznyakoff <address@hidden>
Date:   Mon Nov 28 21:37:17 2011 +0200

    Fix a bug in imap4d parser, add more tests.
    
    * imap4d/io.c (gettok): Fix memory overwrite.
    * imap4d/tests/fetch.at: Add checks for HEADER, HEADER.FIELDS,
    HEADER.FIELDS.NOT, and TEXT applied to message/rfc822 parts.
    * testsuite/spool/msg.mbox: New file.
    * testsuite/spool/DISTFILES: Add msg.mbox.

-----------------------------------------------------------------------

Summary of changes:
 imap4d/io.c               |    4 +-
 imap4d/tests/fetch.at     |   56 +++++++++++++++++++++++++++++++++++++-------
 scheme/.gitignore         |    5 ++-
 testsuite/spool/DISTFILES |    1 +
 testsuite/spool/msg.mbox  |   44 +++++++++++++++++++++++++++++++++++
 5 files changed, 97 insertions(+), 13 deletions(-)
 create mode 100644 testsuite/spool/msg.mbox

diff --git a/imap4d/io.c b/imap4d/io.c
index c0535fd..c622162 100644
--- a/imap4d/io.c
+++ b/imap4d/io.c
@@ -528,9 +528,9 @@ gettok (struct imap4d_tokbuf *tok, size_t off)
        return insert_nul (tok, off);
       off++;
     }
-  buf[off++] = 0;
+  insert_nul (tok, off);
   
-  return off;
+  return off + 1;
 }
 
 static void
diff --git a/imap4d/tests/fetch.at b/imap4d/tests/fetch.at
index dd895d6..66fc2ff 100644
--- a/imap4d/tests/fetch.at
+++ b/imap4d/tests/fetch.at
@@ -14,7 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-dnl 
FETCH_CHECK([NAME=`'],[KW=`'],[ARG=`'],[OUTPUT=`'],[MBOX=mbox1],[FILTERS=`'])
+dnl FETCH_CHECK([NAME=`'],[KW=`'],[ARG=`'],[OUTPUT=`'],[MBOX=mbox1],
+dnl             [FILTERS=`'])
 m4_define([FETCH_CHECK],[
 AT_SETUP([$1])
 AT_KEYWORDS([fetch $2])
@@ -324,10 +325,48 @@ 
bGFyIHN0cmVuZ3RoLCB3aGljaCBpdCBnYXZlIHRvIG15IGphdywKSGFzIGxhc3RlZCB0aGUgcmVz
 dCBvZiBteSBsaWZlLicK
 )])
 
+#         The HEADER, HEADER.FIELDS, HEADER.FIELDS.NOT, and TEXT part
+#         specifiers can be the sole part specifier or can be prefixed by
+#         one or more numeric part specifiers, provided that the numeric
+#         part specifier refers to a part of type MESSAGE/RFC822.  The
+#         MIME part specifier MUST be prefixed by one or more numeric
+#         part specifiers.
+
+FETCH_CHECK([N.HEADER (text/plain)],[fetch-header-subpart-text fetch18],
+[1 BODY[[1.HEADER]]],
+[* 1 FETCH (BODY[[1.HEADER]] NIL)],
+[msg.mbox])
+
+FETCH_CHECK([N.HEADER (message/rfc822)],[fetch-header-subpart-msg fetch19],
+[1 BODY[[2.HEADER]]],
+[* 1 FETCH (BODY[[2.HEADER]] {406}
+Message-ID: <address@hidden>
+Date: Wed, 23 Nov 2011 10:33:17 +0200
+From: Sergey Poznyakoff <address@hidden>
+To: <address@hidden>
+Subject: Re: RFC822 Subtype
+In-reply-to: Your message of Wed, 23 Nov 2011 08:48:16 +0100
+         <address@hidden>
+References: <address@hidden>
+X-Envelope-Date: Wed Nov 23 08:33:17 2011
+X-Envelope-Sender: address@hidden
+
+)],
+[msg.mbox])
+
+FETCH_CHECK([N.HEADER.FIELDS],[fetch-header-fields-subpart fetch20],
+[1 BODY[[2.HEADER.FIELDS (FROM TO)]]],
+[* 1 FETCH (BODY[[2.HEADER.FIELDS (FROM TO)]] {70}
+FROM: Sergey Poznyakoff <address@hidden>
+TO: <address@hidden>
+
+)],
+[msg.mbox])
+
 # BODY.PEEK[<section>]<<partial>>
 #                    An alternate form of BODY[<section>] that does not
 #                    implicitly set the \Seen flag.
-FETCH_CHECK([BODY.PEEK[[HEADER]]],[fetch-body-peek-header fetch18],
+FETCH_CHECK([BODY.PEEK[[HEADER]]],[fetch-body-peek-header fetch21],
 [1 BODY.PEEK[[HEADER]]],
 [* 1 FETCH (BODY[[HEADER]] {326}
 Received: (from address@hidden)
@@ -345,7 +384,7 @@ Subject: Jabberwocky
 #                syntax of the resulting untagged FETCH data (RFC822
 #                is returned).
 
-FETCH_CHECK([RFC822],[fetch-rfc822 fetch19],
+FETCH_CHECK([RFC822],[fetch-rfc822 fetch22],
 [1 RFC822],
 [* 1 FETCH (FLAGS (\Seen) RFC822 {1298}
 Received: (from address@hidden)
@@ -398,7 +437,7 @@ And the mome raths outgrabe.
 #                differing in the syntax of the resulting untagged
 #                FETCH data (RFC822.HEADER is returned).
 # FIXME: Should it set \Seen flag?
-FETCH_CHECK([RFC822.HEADER],[fetch-rfc822-header fetch20],
+FETCH_CHECK([RFC822.HEADER],[fetch-rfc822-header fetch23],
 [2 RFC822.HEADER],
 [* 2 FETCH (RFC822.HEADER {328}
 Received: (from address@hidden)
@@ -414,14 +453,14 @@ Subject: Re: Jabberwocky
 
 # RFC822.SIZE    The [RFC-822] size of the message.
 
-FETCH_CHECK([RFC822.SIZE],[fetch-rfc822-size fetch21],
+FETCH_CHECK([RFC822.SIZE],[fetch-rfc822-size fetch24],
 [3 RFC822.SIZE],
 [* 3 FETCH (RFC822.SIZE 1611)])
 
 # RFC822.TEXT    Functionally equivalent to BODY[TEXT], differing in
 #                the syntax of the resulting untagged FETCH data
 #                (RFC822.TEXT is returned).
-FETCH_CHECK([RFC822.TEXT],[fetch-rfc822-text  fetch22],
+FETCH_CHECK([RFC822.TEXT],[fetch-rfc822-text  fetch25],
 [2 RFC822.TEXT],
 [* 2 FETCH (FLAGS (\Seen) RFC822.TEXT {219}
 It seems very pretty, but it's *rather* hard to understand!'
@@ -433,7 +472,7 @@ that's clear, at any rate...
 # FAST           Macro equivalent to: (FLAGS INTERNALDATE
 #                RFC822.SIZE)
 
-FETCH_CHECK([FAST],[fetch-fast fetch23],
+FETCH_CHECK([FAST],[fetch-fast fetch26],
 [1 FAST],
 [* 1 FETCH (FLAGS (\Recent) INTERNALDATE "28-Dec-2001 22:18:09 +0000" 
RFC822.SIZE 1298)],
 [],
@@ -442,11 +481,10 @@ FETCH_CHECK([FAST],[fetch-fast fetch23],
 # FULL           Macro equivalent to: (FLAGS INTERNALDATE
 #                RFC822.SIZE ENVELOPE BODY)
 
-FETCH_CHECK([FULL],[fetch-full fetch24],
+FETCH_CHECK([FULL],[fetch-full fetch27],
 [4 FULL],
 [* 4 FETCH (FLAGS (\Recent) INTERNALDATE "13-Jul-2002 00:50:58 +0000" 
RFC822.SIZE 3483 ENVELOPE ("Sat, 13 Jul 2002 00:50:58 +0300" "Nested MIME" 
(("Sergey Poznyakoff" NIL "gray" "example.net")) (("Sergey Poznyakoff" NIL 
"gray" "example.net")) (("Sergey Poznyakoff" NIL "gray" "example.net")) (("Foo 
Bar" NIL "foobar" "nonexistent.net")) NIL NIL NIL "<address@hidden>") BODY 
(("text" "plain" ("name" "msg.21" "charset" "us-ascii") "<address@hidden>" 
"Father William Part I" "7BIT" 351 10)(("application" "octet-stream" ("name" 
"msg.22") "<address@hidden>" "Father William Part II" "base64" 
486)(("application" "octet-stream" ("name" "msg.23") "<address@hidden>" "Father 
William Part III" "base64" 490)("application" "octet-stream" ("name" "msg.24") 
"<address@hidden>" "Father William Part IV" "base64" 502) "mixed" NIL NIL NIL) 
"mixed" NIL NIL NIL) "mixed" NIL NIL NIL))],
 [],
 [fixup_tz])
 
-
 dnl ----------------------------------------------------------------------
diff --git a/scheme/.gitignore b/scheme/.gitignore
index 3ab9db1..5e791b9 100644
--- a/scheme/.gitignore
+++ b/scheme/.gitignore
@@ -1,2 +1,3 @@
-sieve.scm
-sieve.sed
\ No newline at end of file
+guimb
+package.sed
+sieve2scm
diff --git a/testsuite/spool/DISTFILES b/testsuite/spool/DISTFILES
index 59bb01e..383ba02 100644
--- a/testsuite/spool/DISTFILES
+++ b/testsuite/spool/DISTFILES
@@ -1,6 +1,7 @@
 bigto.mbox
 mbox1
 mbox
+msg.mbox
 search.mbox
 sieve.mbox
 relational.mbox
diff --git a/testsuite/spool/msg.mbox b/testsuite/spool/msg.mbox
new file mode 100644
index 0000000..dc90cb0
--- /dev/null
+++ b/testsuite/spool/msg.mbox
@@ -0,0 +1,44 @@
+From address@hidden Sat Nov 26 22:45:20 2011
+Date: Sat, 26 Nov 2011 22:45:20 +0200
+From: Sergey Poznyakoff <address@hidden>
+To: <address@hidden>
+Subject: rfc2046
+Content-Type: multipart/mixed; boundary="1595057156-1322340286=:8528"
+MIME-Version: 1.0
+Status: OR
+
+--1595057156-1322340286=:8528
+Content-ID: <address@hidden>
+Content-Type: text/plain
+
+An excerpt from RFC 2046 regarding message/rfc822.
+
+
+--1595057156-1322340286=:8528
+Content-Transfer-Encoding: 7bit
+Content-Description: 
+Content-ID: <address@hidden>
+Content-Type: message/rfc822; name="1.msg"
+
+Message-ID: <address@hidden>
+Date: Wed, 23 Nov 2011 10:33:17 +0200
+From: Sergey Poznyakoff <address@hidden>
+To: <address@hidden>
+Subject: Re: RFC822 Subtype
+In-reply-to: Your message of Wed, 23 Nov 2011 08:48:16 +0100
+         <address@hidden>
+References: <address@hidden>
+X-Envelope-Date: Wed Nov 23 08:33:17 2011
+X-Envelope-Sender: address@hidden
+
+5.2.1.  RFC822 Subtype
+
+   A media type of "message/rfc822" indicates that the body contains an
+   encapsulated message, with the syntax of an RFC 822 message.
+   However, unlike top-level RFC 822 messages, the restriction that each
+   "message/rfc822" body must include a "From", "Date", and at least one
+   destination header is removed and replaced with the requirement that
+   at least one of "From", "Subject", or "Date" must be present.
+
+--1595057156-1322340286=:8528--
+


hooks/post-receive
-- 
GNU Mailutils