Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit bec1d590 bec1d590b59eb514e381dcfef4ee2e08e1a2fb1b by Sergey Poznyakoff
Options

Update to match bugfixes in mime.c

1 parent c0a1ef3a
Inline Side-by-side
Showing 4 changed files with 17 additions and 21 deletions
...@@ -82,7 +82,7 @@ imap4d_test "FETCH 1:\* ALL"\ ...@@ -82,7 +82,7 @@ imap4d_test "FETCH 1:\* ALL"\
82 "2 FETCH (FLAGS (\\Recent) INTERNALDATE \"28-Dec-2001 23:28:09 +0000\" RFC822.SIZE 548 ENVELOPE (\"Fri, 28 Dec 2001 23:28:08 +0200\" \"Re: Jabberwocky\" ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200112232808.fERKR9N16790@dontmailme.org>\"))"\ 82 "2 FETCH (FLAGS (\\Recent) INTERNALDATE \"28-Dec-2001 23:28:09 +0000\" RFC822.SIZE 548 ENVELOPE (\"Fri, 28 Dec 2001 23:28:08 +0200\" \"Re: Jabberwocky\" ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200112232808.fERKR9N16790@dontmailme.org>\"))"\
83 "3 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" RFC822.SIZE 1668 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\ 83 "3 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" RFC822.SIZE 1668 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\
84 "4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3568 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\"))"\ 84 "4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3568 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\"))"\
85 "5 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" RFC822.SIZE 937 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Empty MIME Parts\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\ 85 "5 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" RFC822.SIZE 941 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Empty MIME Parts\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\
86 "OK" 86 "OK"
87 87
88 # BODYSTRUCTURE The [MIME-IMB] body structure of the message. This 88 # BODYSTRUCTURE The [MIME-IMB] body structure of the message. This
...@@ -99,24 +99,24 @@ imap4d_test "FETCH 2 BODYSTRUCTURE"\ ...@@ -99,24 +99,24 @@ imap4d_test "FETCH 2 BODYSTRUCTURE"\
99 "OK" 99 "OK"
100 100
101 imap4d_test "FETCH 3 BODYSTRUCTURE"\ 101 imap4d_test "FETCH 3 BODYSTRUCTURE"\
102 "3 FETCH (BODYSTRUCTURE ((\"text\" \"plain\" (\"name\" \"msg.1\" \"charset\" \"us-ascii\") \"<5082.1026510189.1@Mirddin.farlep.net>\" \"How doth\" \"7BIT\" 241 10 NIL NIL NIL)(\"application\" \"octet-stream\" (\"name\" \"msg.21\") \"<5082.1026510189.2@Mirddin.farlep.net>\" \"Father William Part I\" \"base64\" 470 NIL NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa0\") NIL NIL))"\ 102 "3 FETCH (BODYSTRUCTURE ((\"text\" \"plain\" (\"name\" \"msg.1\" \"charset\" \"us-ascii\") \"<5082.1026510189.1@Mirddin.farlep.net>\" \"How doth\" \"7BIT\" 239 9 NIL NIL NIL)(\"application\" \"octet-stream\" (\"name\" \"msg.21\") \"<5082.1026510189.2@Mirddin.farlep.net>\" \"Father William Part I\" \"base64\" 468 NIL NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa0\") NIL NIL))"\
103 "OK" 103 "OK"
104 104
105 imap4d_test "FETCH 4 BODYSTRUCTURE"\ 105 imap4d_test "FETCH 4 BODYSTRUCTURE"\
106 "4 FETCH (BODYSTRUCTURE ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" \"us-ascii\") \"<5122.1026510654.2@Mirddin.farlep.net>\" \"Father William Part I\" \"7BIT\" 353 11 NIL NIL NIL)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") \"<5122.1026510654.4@Mirddin.farlep.net>\" \"Father William Part II\" \"base64\" 488 NIL NIL NIL)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") \"<5122.1026510654.6@Mirddin.farlep.net>\" \"Father William Part III\" \"base64\" 492 NIL NIL NIL)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") \"<5122.1026510654.7@Mirddin.farlep.net>\" \"Father William Part IV\" \"base64\" 504 NIL NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa2\") NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa1\") NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa0\") NIL NIL))"\ 106 "4 FETCH (BODYSTRUCTURE ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" \"us-ascii\") \"<5122.1026510654.2@Mirddin.farlep.net>\" \"Father William Part I\" \"7BIT\" 351 10 NIL NIL NIL)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") \"<5122.1026510654.4@Mirddin.farlep.net>\" \"Father William Part II\" \"base64\" 486 NIL NIL NIL)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") \"<5122.1026510654.6@Mirddin.farlep.net>\" \"Father William Part III\" \"base64\" 490 NIL NIL NIL)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") \"<5122.1026510654.7@Mirddin.farlep.net>\" \"Father William Part IV\" \"base64\" 502 NIL NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa2\") NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa1\") NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa0\") NIL NIL))"\
107 "OK" 107 "OK"
108 108
109 imap4d_test "FETCH 5 BODYSTRUCTURE"\ 109 imap4d_test "FETCH 5 BODYSTRUCTURE"\
110 "5 FETCH (BODYSTRUCTURE ((\"text\" \"plain\" (\"name\" \"empty\" \"charset\" \"us-ascii\") \"<5082.1026510189.1@Mirddin.farlep.net>\" \"Empty part\" \"7BIT\" 0 0 NIL NIL NIL)(\"text\" \"plain\" (\"name\" \"single.line\" \"charset\" \"\us-ascii\") \"<5082.1026510189.2@Mirddin.farlep.net>\" \"Single line part\" \"7BIT\" 2 1 NIL NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa0\") NIL NIL))"\ 110 "5 FETCH (BODYSTRUCTURE ((\"text\" \"plain\" (\"name\" \"empty\" \"charset\" \"us-ascii\") \"<5082.1026510189.1@Mirddin.farlep.net>\" \"Empty part\" \"7BIT\" 0 0 NIL NIL NIL)(\"text\" \"plain\" (\"name\" \"single.line\" \"charset\" \"us-ascii\") \"<5082.1026510189.2@Mirddin.farlep.net>\" \"Single line part\" \"7BIT\" 2 1 NIL NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa0\") NIL NIL))"\
111 "OK" 111 "OK"
112 112
113 # BODY The text of a particular body section. 113 # BODY The text of a particular body section.
114 imap4d_test "FETCH 1:* BODY"\ 114 imap4d_test "FETCH 1:* BODY"\
115 "1 FETCH (BODY (\"TEXT\" \"PLAIN\" (\"CHARSET\" \"US-ASCII\") NIL NIL \"7BIT\" 972 35))"\ 115 "1 FETCH (BODY (\"TEXT\" \"PLAIN\" (\"CHARSET\" \"US-ASCII\") NIL NIL \"7BIT\" 972 35))"\
116 "2 FETCH (BODY (\"TEXT\" \"PLAIN\" (\"CHARSET\" \"US-ASCII\") NIL NIL \"7BIT\" 219 4))"\ 116 "2 FETCH (BODY (\"TEXT\" \"PLAIN\" (\"CHARSET\" \"US-ASCII\") NIL NIL \"7BIT\" 219 4))"\
117 "3 FETCH (BODY ((\"text\" \"plain\" (\"name\" \"msg.1\" \"charset\" \"us-ascii\") \"<5082.1026510189.1@Mirddin.farlep.net>\" \"How doth\" \"7BIT\" 241 10)(\"application\" \"octet-stream\" (\"name\" \"msg.21\") \"<5082.1026510189.2@Mirddin.farlep.net>\" \"Father William Part I\" \"base64\" 470) \"mixed\" NIL NIL NIL))"\ 117 "3 FETCH (BODY ((\"text\" \"plain\" (\"name\" \"msg.1\" \"charset\" \"us-ascii\") \"<5082.1026510189.1@Mirddin.farlep.net>\" \"How doth\" \"7BIT\" 239 9)(\"application\" \"octet-stream\" (\"name\" \"msg.21\") \"<5082.1026510189.2@Mirddin.farlep.net>\" \"Father William Part I\" \"base64\" 468) \"mixed\" NIL NIL NIL))"\
118 "4 FETCH (BODY ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" \"us-ascii\") \"<5122.1026510654.2@Mirddin.farlep.net>\" \"Father William Part I\" \"7BIT\" 353 11)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") \"<5122.1026510654.4@Mirddin.farlep.net>\" \"Father William Part II\" \"base64\" 488)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") \"<5122.1026510654.6@Mirddin.farlep.net>\" \"Father William Part III\" \"base64\" 492)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") \"<5122.1026510654.7@Mirddin.farlep.net>\" \"Father William Part IV\" \"base64\" 504) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL))"\ 118 "4 FETCH (BODY ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" \"us-ascii\") \"<5122.1026510654.2@Mirddin.farlep.net>\" \"Father William Part I\" \"7BIT\" 351 10)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") \"<5122.1026510654.4@Mirddin.farlep.net>\" \"Father William Part II\" \"base64\" 486)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") \"<5122.1026510654.6@Mirddin.farlep.net>\" \"Father William Part III\" \"base64\" 490)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") \"<5122.1026510654.7@Mirddin.farlep.net>\" \"Father William Part IV\" \"base64\" 502) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL))"\
119 "5 FETCH (BODY ((\"text\" \"plain\" (\"name\" \"empty\" \"charset\" \"us-ascii\") \"<5082.1026510189.1@Mirddin.farlep.net>\" \"Empty part\" \"7BIT\" 0 0)(\"text\" \"plain\" (\"name\" \"single.line\" \"charset\" \"\us-ascii\") \"<5082.1026510189.2@Mirddin.farlep.net>\" \"Single line part\" \"7BIT\" 2 1) \"mixed\" NIL NIL NIL))"\ 119 "5 FETCH (BODY ((\"text\" \"plain\" (\"name\" \"empty\" \"charset\" \"us-ascii\") \"<5082.1026510189.1@Mirddin.farlep.net>\" \"Empty part\" \"7BIT\" 0 0)(\"text\" \"plain\" (\"name\" \"single.line\" \"charset\" \"us-ascii\") \"<5082.1026510189.2@Mirddin.farlep.net>\" \"Single line part\" \"7BIT\" 2 1) \"mixed\" NIL NIL NIL))"\
120 "OK" 120 "OK"
121 121
122 # BODY.PEEK[<section>]<<partial>> 122 # BODY.PEEK[<section>]<<partial>>
...@@ -329,9 +329,8 @@ imap4d_test "FETCH 3 BODY\[1.MIME\]"\ ...@@ -329,9 +329,8 @@ imap4d_test "FETCH 3 BODY\[1.MIME\]"\
329 ")"\ 329 ")"\
330 "OK" 330 "OK"
331 331
332
333 imap4d_test "FETCH 4 BODY\[2.2.1\]"\ 332 imap4d_test "FETCH 4 BODY\[2.2.1\]"\
334 "4 FETCH (FLAGS (\\Seen) BODY\[2.2.1\] {492}"\ 333 "4 FETCH (FLAGS (\\Seen) BODY\[2.2.1\] {490}"\
335 -literal\ 334 -literal\
336 "YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBhbmQgeW91ciBqYXdzIGFyZSB0b28gd2Vh"\ 335 "YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBhbmQgeW91ciBqYXdzIGFyZSB0b28gd2Vh"\
337 "awpGb3IgYW55dGhpbmcgdG91Z2hlciB0aGFuIHN1ZXQ7CllldCB5b3UgZmluaXNoZWQgdGhlIGdv"\ 336 "awpGb3IgYW55dGhpbmcgdG91Z2hlciB0aGFuIHN1ZXQ7CllldCB5b3UgZmluaXNoZWQgdGhlIGdv"\
...@@ -340,12 +339,11 @@ imap4d_test "FETCH 4 BODY\[2.2.1\]"\ ...@@ -340,12 +339,11 @@ imap4d_test "FETCH 4 BODY\[2.2.1\]"\
340 "dGhlIGxhdywKQW5kIGFyZ3VlZCBlYWNoIGNhc2Ugd2l0aCBteSB3aWZlOwpBbmQgdGhlIG11c2N1"\ 339 "dGhlIGxhdywKQW5kIGFyZ3VlZCBlYWNoIGNhc2Ugd2l0aCBteSB3aWZlOwpBbmQgdGhlIG11c2N1"\
341 "bGFyIHN0cmVuZ3RoLCB3aGljaCBpdCBnYXZlIHRvIG15IGphdywKSGFzIGxhc3RlZCB0aGUgcmVz"\ 340 "bGFyIHN0cmVuZ3RoLCB3aGljaCBpdCBnYXZlIHRvIG15IGphdywKSGFzIGxhc3RlZCB0aGUgcmVz"\
342 "dCBvZiBteSBsaWZlLicK"\ 341 "dCBvZiBteSBsaWZlLicK"\
343 ""\
344 ")"\ 342 ")"\
345 "OK" 343 "OK"
346 344
347 imap4d_test "FETCH 4 BODY\[2.2.1.TEXT\]"\ 345 imap4d_test "FETCH 4 BODY\[2.2.1.TEXT\]"\
348 "4 FETCH (BODY\[2.2.1.TEXT\] {492}"\ 346 "4 FETCH (BODY\[2.2.1.TEXT\] {490}"\
349 -literal\ 347 -literal\
350 "YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBhbmQgeW91ciBqYXdzIGFyZSB0b28gd2Vh"\ 348 "YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBhbmQgeW91ciBqYXdzIGFyZSB0b28gd2Vh"\
351 "awpGb3IgYW55dGhpbmcgdG91Z2hlciB0aGFuIHN1ZXQ7CllldCB5b3UgZmluaXNoZWQgdGhlIGdv"\ 349 "awpGb3IgYW55dGhpbmcgdG91Z2hlciB0aGFuIHN1ZXQ7CllldCB5b3UgZmluaXNoZWQgdGhlIGdv"\
...@@ -354,12 +352,11 @@ imap4d_test "FETCH 4 BODY\[2.2.1.TEXT\]"\ ...@@ -354,12 +352,11 @@ imap4d_test "FETCH 4 BODY\[2.2.1.TEXT\]"\
354 "dGhlIGxhdywKQW5kIGFyZ3VlZCBlYWNoIGNhc2Ugd2l0aCBteSB3aWZlOwpBbmQgdGhlIG11c2N1"\ 352 "dGhlIGxhdywKQW5kIGFyZ3VlZCBlYWNoIGNhc2Ugd2l0aCBteSB3aWZlOwpBbmQgdGhlIG11c2N1"\
355 "bGFyIHN0cmVuZ3RoLCB3aGljaCBpdCBnYXZlIHRvIG15IGphdywKSGFzIGxhc3RlZCB0aGUgcmVz"\ 353 "bGFyIHN0cmVuZ3RoLCB3aGljaCBpdCBnYXZlIHRvIG15IGphdywKSGFzIGxhc3RlZCB0aGUgcmVz"\
356 "dCBvZiBteSBsaWZlLicK"\ 354 "dCBvZiBteSBsaWZlLicK"\
357 ""\
358 ")"\ 355 ")"\
359 "OK" 356 "OK"
360 357
361 imap4d_test "FETCH 4 BODY\[2.2.TEXT\]"\ 358 imap4d_test "FETCH 4 BODY\[2.2.TEXT\]"\
362 "4 FETCH (BODY\[2.2.TEXT\] {1448}"\ 359 "4 FETCH (BODY\[2.2.TEXT\] {1446}"\
363 -literal\ 360 -literal\
364 -- "------- =_aaaaaaaaaa2"\ 361 -- "------- =_aaaaaaaaaa2"\
365 "Content-Type: application/octet-stream; name=\"msg.23\""\ 362 "Content-Type: application/octet-stream; name=\"msg.23\""\
...@@ -390,7 +387,6 @@ imap4d_test "FETCH 4 BODY\[2.2.TEXT\]"\ ...@@ -390,7 +387,6 @@ imap4d_test "FETCH 4 BODY\[2.2.TEXT\]"\
390 "IGtpY2sgeW91IGRvd24gc3RhaXJzIScK"\ 387 "IGtpY2sgeW91IGRvd24gc3RhaXJzIScK"\
391 ""\ 388 ""\
392 -- "------- =_aaaaaaaaaa2--"\ 389 -- "------- =_aaaaaaaaaa2--"\
393 ""\
394 ")"\ 390 ")"\
395 "OK" 391 "OK"
396 392
...@@ -521,7 +517,7 @@ imap4d_test "FETCH 1 FAST" \ ...@@ -521,7 +517,7 @@ imap4d_test "FETCH 1 FAST" \
521 # RFC822.SIZE ENVELOPE BODY) 517 # RFC822.SIZE ENVELOPE BODY)
522 518
523 imap4d_test "FETCH 4 FULL"\ 519 imap4d_test "FETCH 4 FULL"\
524 "4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3568 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\") BODY ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" \"us-ascii\") \"<5122.1026510654.2@Mirddin.farlep.net>\" \"Father William Part I\" \"7BIT\" 353 11)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") \"<5122.1026510654.4@Mirddin.farlep.net>\" \"Father William Part II\" \"base64\" 488)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") \"<5122.1026510654.6@Mirddin.farlep.net>\" \"Father William Part III\" \"base64\" 492)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") \"<5122.1026510654.7@Mirddin.farlep.net>\" \"Father William Part IV\" \"base64\" 504) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL))"\ 520 "4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3568 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\") BODY ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" \"us-ascii\") \"<5122.1026510654.2@Mirddin.farlep.net>\" \"Father William Part I\" \"7BIT\" 351 10)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") \"<5122.1026510654.4@Mirddin.farlep.net>\" \"Father William Part II\" \"base64\" 486)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") \"<5122.1026510654.6@Mirddin.farlep.net>\" \"Father William Part III\" \"base64\" 490)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") \"<5122.1026510654.7@Mirddin.farlep.net>\" \"Father William Part IV\" \"base64\" 502) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL))"\
525 "OK" 521 "OK"
526 522
527 imap4d_stop 523 imap4d_stop
......
...@@ -259,7 +259,6 @@ mail_test -message "decoding simple MIME messages" \ ...@@ -259,7 +259,6 @@ mail_test -message "decoding simple MIME messages" \
259 "How neatly spread his claws,"\ 259 "How neatly spread his claws,"\
260 "And welcome little fishes in"\ 260 "And welcome little fishes in"\
261 "With gently smiling jaws!"\ 261 "With gently smiling jaws!"\
262 ""\
263 "+------------------------------------------------------------------------------+"\ 262 "+------------------------------------------------------------------------------+"\
264 "| Message=3\[2\]"\ 263 "| Message=3\[2\]"\
265 "| Type=application/octet-stream; name=\"msg.21\""\ 264 "| Type=application/octet-stream; name=\"msg.21\""\
...@@ -278,8 +277,8 @@ mail_test -message "decoding simple MIME messages" \ ...@@ -278,8 +277,8 @@ mail_test -message "decoding simple MIME messages" \
278 "`In my youth,' Father William replied to his son,"\ 277 "`In my youth,' Father William replied to his son,"\
279 "`I feared it might injure the brain;"\ 278 "`I feared it might injure the brain;"\
280 "But, now that I'm perfectly sure I have none,"\ 279 "But, now that I'm perfectly sure I have none,"\
281 "Why, I do it again and again.'"\ 280 "Why, I do it again and again.'"
282 "" 281
283 mail_test -message "decoding nested MIME messages" \ 282 mail_test -message "decoding nested MIME messages" \
284 "decode 4" \ 283 "decode 4" \
285 "+------------------------------------------------------------------------------+"\ 284 "+------------------------------------------------------------------------------+"\
...@@ -301,7 +300,6 @@ mail_test -message "decoding nested MIME messages" \ ...@@ -301,7 +300,6 @@ mail_test -message "decoding nested MIME messages" \
301 "But, now that I'm perfectly sure I have none,"\ 300 "But, now that I'm perfectly sure I have none,"\
302 "Why, I do it again and again.'"\ 301 "Why, I do it again and again.'"\
303 ""\ 302 ""\
304 ""\
305 "+------------------------------------------------------------------------------+"\ 303 "+------------------------------------------------------------------------------+"\
306 "| Message=4\[2\[1\]\]"\ 304 "| Message=4\[2\[1\]\]"\
307 "| Type=application/octet-stream; name=\"msg.22\""\ 305 "| Type=application/octet-stream; name=\"msg.22\""\
......
...@@ -44,14 +44,14 @@ mail_start -reuse-spool "--file=%mbox1" ...@@ -44,14 +44,14 @@ mail_start -reuse-spool "--file=%mbox1"
44 mail_test "h" \ 44 mail_test "h" \
45 ">U 1 Bar Fri Dec 28 23:28 16/579 Re: Jabberwocky"\ 45 ">U 1 Bar Fri Dec 28 23:28 16/579 Re: Jabberwocky"\
46 " U 2 Sergey Poznyakoff Sat Jul 13 00:43 44/1645 Simple MIME"\ 46 " U 2 Sergey Poznyakoff Sat Jul 13 00:43 44/1645 Simple MIME"\
47 " U 3 Sergey Poznyakoff Sat Jul 13 00:43 27/931 Empty MIME Parts" 47 " U 3 Sergey Poznyakoff Sat Jul 13 00:43 29/933 Empty MIME Parts"
48 48
49 # Send first message to mbox... 49 # Send first message to mbox...
50 mail_command "mbox 1" 50 mail_command "mbox 1"
51 mail_test "h" \ 51 mail_test "h" \
52 ">M 1 Bar Fri Dec 28 23:28 16/579 Re: Jabberwocky"\ 52 ">M 1 Bar Fri Dec 28 23:28 16/579 Re: Jabberwocky"\
53 " U 2 Sergey Poznyakoff Sat Jul 13 00:43 44/1645 Simple MIME"\ 53 " U 2 Sergey Poznyakoff Sat Jul 13 00:43 44/1645 Simple MIME"\
54 " U 3 Sergey Poznyakoff Sat Jul 13 00:43 27/931 Empty MIME Parts" 54 " U 3 Sergey Poznyakoff Sat Jul 13 00:43 29/933 Empty MIME Parts"
55 55
56 # ... and quit 56 # ... and quit
57 mail_test -noprompt "quit" \ 57 mail_test -noprompt "quit" \
......
...@@ -199,12 +199,14 @@ mu_exec -message "readmsg *" -arg "\\\\*" \ ...@@ -199,12 +199,14 @@ mu_exec -message "readmsg *" -arg "\\\\*" \
199 "Content-ID: <5082.1026510189.1@Mirddin.farlep.net>"\ 199 "Content-ID: <5082.1026510189.1@Mirddin.farlep.net>"\
200 "Content-Description: Empty part"\ 200 "Content-Description: Empty part"\
201 ""\ 201 ""\
202 ""\
202 -- "------- =_aaaaaaaaaa0"\ 203 -- "------- =_aaaaaaaaaa0"\
203 "Content-Type: text/plain; name=\"single.line\"; charset=\"us-ascii\""\ 204 "Content-Type: text/plain; name=\"single.line\"; charset=\"us-ascii\""\
204 "Content-ID: <5082.1026510189.2@Mirddin.farlep.net>"\ 205 "Content-ID: <5082.1026510189.2@Mirddin.farlep.net>"\
205 "Content-Description: Single line part"\ 206 "Content-Description: Single line part"\
206 ""\ 207 ""\
207 ""\ 208 ""\
209 ""\
208 -- "------- =_aaaaaaaaaa0--"\ 210 -- "------- =_aaaaaaaaaa0--"\
209 ""\ 211 ""\
210 "" 212 ""
......