summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2010-09-03 01:15:00 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2010-09-03 01:17:08 +0300
commit96fb7b6c2142e6da7ea4c56923c6289b1bfd244e (patch)
tree698cc5e6d270712643816424853c7c1c8f6488b1
parentfbffe40a9758e084a98710e70f4c7b703cee315a (diff)
downloadmailutils-96fb7b6c2142e6da7ea4c56923c6289b1bfd244e.tar.gz
mailutils-96fb7b6c2142e6da7ea4c56923c6289b1bfd244e.tar.bz2
Minor change.
* pop3d/extra.c (pop3d_setio): Use the canonic name of the CRLF filter, instead of the legacy "rfc822". * imap4d/fetch.c: Likewise. * imap4d/util.c: Likewise.
-rw-r--r--imap4d/fetch.c2
-rw-r--r--imap4d/util.c4
-rw-r--r--pop3d/extra.c7
3 files changed, 7 insertions, 6 deletions
diff --git a/imap4d/fetch.c b/imap4d/fetch.c
index 7ada8fd3b..958703cb3 100644
--- a/imap4d/fetch.c
+++ b/imap4d/fetch.c
@@ -692,7 +692,7 @@ fetch_io (mu_stream_t stream, size_t start, size_t size, size_t max)
size_t n = 0;
- mu_filter_create (&rfc, stream, "rfc822", MU_FILTER_ENCODE,
+ mu_filter_create (&rfc, stream, "CRLF", MU_FILTER_ENCODE,
MU_STREAM_READ|MU_STREAM_SEEK);
if (start == 0 && size == (size_t) -1)
diff --git a/imap4d/util.c b/imap4d/util.c
index e6d828a9c..11cc49d48 100644
--- a/imap4d/util.c
+++ b/imap4d/util.c
@@ -816,14 +816,14 @@ util_setio (FILE *in, FILE *out)
if (mu_stdio_stream_create (&tmp, fileno (in), 0))
imap4d_bye (ERR_NO_IFILE);
mu_stream_set_buffer (tmp, mu_buffer_line, 1024);
- mu_filter_create (&istream, tmp, "rfc822", MU_FILTER_DECODE,
+ mu_filter_create (&istream, tmp, "CRLF", MU_FILTER_DECODE,
MU_STREAM_READ | MU_STREAM_AUTOCLOSE);
mu_stream_set_buffer (istream, mu_buffer_line, 1024);
if (mu_stdio_stream_create (&tmp, fileno (out), 0))
imap4d_bye (ERR_NO_OFILE);
mu_stream_set_buffer (tmp, mu_buffer_line, 1024);
- mu_filter_create (&ostream, tmp, "rfc822", MU_FILTER_ENCODE,
+ mu_filter_create (&ostream, tmp, "CRLF", MU_FILTER_ENCODE,
MU_STREAM_WRITE | MU_STREAM_AUTOCLOSE);
mu_stream_set_buffer (ostream, mu_buffer_line, 1024);
}
diff --git a/pop3d/extra.c b/pop3d/extra.c
index c34e05ca4..52bb220f5 100644
--- a/pop3d/extra.c
+++ b/pop3d/extra.c
@@ -151,11 +151,12 @@ pop3d_setio (FILE *in, FILE *out)
/* Convert all writes to CRLF form.
There is no need to convert reads, as the code ignores extra \r anyway.
- This also installs an extra full buffering, which is needed for TLS
- code (see below). */
- if (mu_filter_create (&iostream, str, "rfc822", MU_FILTER_ENCODE,
+ */
+ if (mu_filter_create (&iostream, str, "CRLF", MU_FILTER_ENCODE,
MU_STREAM_WRITE | MU_STREAM_RDTHRU))
pop3d_abquit (ERR_NO_IFILE);
+ /* Change buffering scheme: filter streams are fully buffered by default. */
+ mu_stream_set_buffer (iostream, mu_buffer_line, 1024);
if (pop3d_transcript)
{

Return to:

Send suggestions and report system problems to the System administrator.