[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-save.c, 1.48, 1.49 maildir-storage.c, 1.94, 1.95

[cras at dovecot.org]

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

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



Index: maildir-save.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-save.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- maildir-save.c	15 Mar 2005 19:01:52 -0000	1.48
+++ maildir-save.c	3 Apr 2005 11:36:16 -0000	1.49
@@ -37,7 +37,6 @@
 	time_t received_date;
 	uint32_t seq;
 
-	unsigned int save_crlf:1;
 	unsigned int failed:1;
 };
 
@@ -96,8 +95,6 @@
 	ctx->tmpdir = p_strconcat(pool, ibox->path, "/tmp", NULL);
 	ctx->newdir = p_strconcat(pool, ibox->path, "/new", NULL);
 	ctx->curdir = p_strconcat(pool, ibox->path, "/cur", NULL);
-
-	ctx->save_crlf = getenv("MAIL_SAVE_CRLF") != NULL;
 	return ctx;
 }
 
@@ -141,7 +138,8 @@
 	ctx->input = input;
 
 	output = o_stream_create_file(ctx->fd, system_pool, 0, FALSE);
-	ctx->output = ctx->save_crlf ?
+	ctx->output = (ctx->ibox->storage->storage.flags &
+		       MAIL_STORAGE_FLAG_SAVE_CRLF) != 0 ?
 		o_stream_create_crlf(default_pool, output) :
 		o_stream_create_lf(default_pool, output);
 	o_stream_unref(output);

Index: maildir-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- maildir-storage.c	29 Mar 2005 13:33:07 -0000	1.94
+++ maildir-storage.c	3 Apr 2005 11:36:16 -0000	1.95
@@ -32,7 +32,8 @@
 
 static struct mail_storage *
 maildir_create(const char *data, const char *user,
-	       enum mail_storage_flags flags)
+	       enum mail_storage_flags flags,
+	       enum mail_storage_lock_method lock_method)
 {
 	int debug = (flags & MAIL_STORAGE_FLAG_DEBUG) != 0;
 	struct index_storage *storage;
@@ -131,7 +132,7 @@
 	storage->control_dir = p_strdup(pool, home_expand(control_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);
 
 	(void)verify_inbox(storage);
 	return &storage->storage;