[dovecot-cvs] dovecot/src/imap imap-fetch-body.c, 1.2, 1.3 main.c, 1.53, 1.54

[cras at dovecot.org]

Update of /home/cvs/dovecot/src/imap
In directory talvi:/tmp/cvs-serv31163/imap

Modified Files:
	imap-fetch-body.c main.c 
Log Message:
header filter can now optionally use either LF or CRLF linefeeds.



Index: imap-fetch-body.c
===================================================================
RCS file: /home/cvs/dovecot/src/imap/imap-fetch-body.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- imap-fetch-body.c	22 Aug 2004 02:58:39 -0000	1.2
+++ imap-fetch-body.c	22 Aug 2004 05:54:54 -0000	1.3
@@ -340,18 +340,21 @@
 	if (strncmp(header_section, "HEADER.FIELDS ", 14) == 0) {
 		fields = imap_fetch_get_body_fields(header_section + 14,
 						    &fields_count);
-		input = i_stream_create_header_filter(ctx->cur_input, FALSE,
+		input = i_stream_create_header_filter(ctx->cur_input,
+						      FALSE, TRUE,
 						      fields, fields_count,
 						      NULL, NULL);
 	} else if (strncmp(header_section, "HEADER.FIELDS.NOT ", 18) == 0) {
 		fields = imap_fetch_get_body_fields(header_section + 18,
 						    &fields_count);
-		input = i_stream_create_header_filter(ctx->cur_input, TRUE,
+		input = i_stream_create_header_filter(ctx->cur_input,
+						      TRUE, TRUE,
 						      fields, fields_count,
 						      NULL, NULL);
 	} else if (strcmp(header_section, "MIME") == 0) {
 		/* Mime-Version + Content-* fields */
-		input = i_stream_create_header_filter(ctx->cur_input, FALSE,
+		input = i_stream_create_header_filter(ctx->cur_input,
+						      FALSE, TRUE,
 						      NULL, 0,
 						      header_filter_mime, NULL);
 	} else {

Index: main.c
===================================================================
RCS file: /home/cvs/dovecot/src/imap/main.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- main.c	15 Aug 2004 03:40:30 -0000	1.53
+++ main.c	22 Aug 2004 05:54:54 -0000	1.54
@@ -199,6 +199,10 @@
 	closelog();
 }
 
+#include "ostream.h"
+#include "ostream-crlf.h"
+#include <fcntl.h>
+
 int main(int argc __attr_unused__, char *argv[], char *envp[])
 {
 #ifdef DEBUG
@@ -210,6 +214,12 @@
 	lib_init();
 	drop_privileges();
 
+	{ struct ostream *stream = o_stream_create_lf(default_pool, o_stream_create_file(open("/tmp/foo", O_CREAT|O_TRUNC|O_WRONLY, 0600), default_pool, 0, 0));
+
+		o_stream_send_str(stream, "hello\nworld\nja sit crlf\r\nmjoo");
+	o_stream_flush(stream);
+	}
+
         process_title_init(argv, envp);
 	ioloop = io_loop_create(system_pool);