[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-save.c, 1.77, 1.78 mbox-storage.c, 1.114, 1.115

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/mbox
In directory talvi:/tmp/cvs-serv4553/lib-storage/index/mbox

Modified Files:
	mbox-save.c mbox-storage.c 
Log Message:
Moved several getenv()s from lib-storage to main code. deliver binary was
missing several getenvs..



Index: mbox-save.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-save.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- mbox-save.c	2 Apr 2005 21:09:07 -0000	1.77
+++ mbox-save.c	3 Apr 2005 11:36:17 -0000	1.78
@@ -44,7 +44,6 @@
 
 	unsigned int synced:1;
 	unsigned int failed:1;
-	unsigned int save_crlf:1;
 };
 
 static char my_hostdomain[256] = "";
@@ -344,7 +343,6 @@
 		ctx->trans = t->ictx.trans;
 		ctx->append_offset = (uoff_t)-1;
 		ctx->headers = str_new(default_pool, 512);
-		ctx->save_crlf = getenv("MAIL_SAVE_CRLF") != NULL;
 		ctx->mail_offset = (uoff_t)-1;
 	}
 
@@ -396,7 +394,9 @@
 						      mbox_hide_headers_count,
 						      save_header_callback,
 						      ctx);
-		ctx->body_output = getenv("MAIL_SAVE_CRLF") != NULL ?
+		ctx->body_output =
+			(ctx->ibox->storage->storage.flags &
+			 MAIL_STORAGE_FLAG_SAVE_CRLF) != 0 ?
 			o_stream_create_crlf(default_pool, ctx->output) :
 			o_stream_create_lf(default_pool, ctx->output);
 		if (ctx->ibox->mbox_save_md5 && ctx->synced)

Index: mbox-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-storage.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- mbox-storage.c	29 Mar 2005 15:06:39 -0000	1.114
+++ mbox-storage.c	3 Apr 2005 11:36:19 -0000	1.115
@@ -243,7 +243,8 @@
 }
 
 static struct mail_storage *
-mbox_create(const char *data, const char *user, enum mail_storage_flags flags)
+mbox_create(const char *data, const char *user, enum mail_storage_flags flags,
+	    enum mail_storage_lock_method lock_method)
 {
 	int debug = (flags & MAIL_STORAGE_FLAG_DEBUG) != 0;
 	struct index_storage *storage;
@@ -338,7 +339,7 @@
 	storage->index_dir = p_strdup(pool, home_expand(index_dir));
 	storage->user = p_strdup(pool, user);
 	storage->callbacks = p_new(pool, struct mail_storage_callbacks, 1);
-	index_storage_init(storage, flags);
+	index_storage_init(storage, flags, lock_method);
 	return &storage->storage;
 }
 
@@ -511,7 +512,7 @@
 
 	ibox->md5hdr_ext_idx =
 		mail_index_ext_register(ibox->index, "header-md5", 0, 16, 1);
-	if ((flags & MAILBOX_OPEN_KEEP_HEADER_MD5) != 0)
+	if ((storage->storage.flags & MAIL_STORAGE_FLAG_KEEP_HEADER_MD5) != 0)
 		ibox->mbox_save_md5 = TRUE;
 	return ibox;
 }