[dovecot-cvs] dovecot/src/lib-storage/index/maildir Makefile.am, 1.5, 1.6 maildir-list.c, 1.44, NONE maildir-storage.c, 1.131, 1.132 maildir-storage.h, 1.54, 1.55 maildir-uidlist.c, 1.53, 1.54

[tss at dovecot.org]

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

Modified Files:
	Makefile.am maildir-storage.c maildir-storage.h 
	maildir-uidlist.c 
Removed Files:
	maildir-list.c 
Log Message:
Initial code for separation of mailbox accessing and directory layout
handling. It's not yet possible to change the default layouts though.



Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	26 Sep 2005 21:00:29 -0000	1.5
+++ Makefile.am	16 Nov 2006 00:16:34 -0000	1.6
@@ -11,7 +11,6 @@
 libstorage_maildir_a_SOURCES = \
 	maildir-copy.c \
 	maildir-keywords.c \
-	maildir-list.c \
 	maildir-mail.c \
 	maildir-save.c \
 	maildir-storage.c \

--- maildir-list.c DELETED ---

Index: maildir-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- maildir-storage.c	12 Nov 2006 20:04:55 -0000	1.131
+++ maildir-storage.c	16 Nov 2006 00:16:34 -0000	1.132
@@ -1,12 +1,12 @@
 /* Copyright (C) 2002-2006 Timo Sirainen */
 
 #include "lib.h"
+#include "ioloop.h"
 #include "array.h"
 #include "hostpid.h"
 #include "home-expand.h"
 #include "mkdir-parents.h"
 #include "unlink-directory.h"
-#include "subscription-file/subscription-file.h"
 #include "maildir-storage.h"
[...1008 lines suppressed...]
@@ -1027,18 +968,13 @@
 		maildir_free,
 		maildir_autodetect,
 		index_storage_set_callbacks,
-		maildir_get_mailbox_path,
 		maildir_get_mailbox_control_dir,
 		maildir_get_mailbox_index_dir,
 		maildir_mailbox_open,
 		maildir_mailbox_create,
 		maildir_mailbox_delete,
 		maildir_mailbox_rename,
-		maildir_mailbox_list_init,
-		maildir_mailbox_list_next,
-		maildir_mailbox_list_deinit,
-		maildir_set_subscribed,
-		maildir_get_mailbox_name_status,
+		maildir_storage_is_mailbox,
 		index_storage_get_last_error
 	}
 };

Index: maildir-storage.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- maildir-storage.h	7 Nov 2006 21:22:08 -0000	1.54
+++ maildir-storage.h	16 Nov 2006 00:16:34 -0000	1.55
@@ -1,14 +1,10 @@
 #ifndef __MAILDIR_STORAGE_H
 #define __MAILDIR_STORAGE_H
 
-/* Hierarchy separator in Maildir++ filenames - shouldn't be changed */
-#define MAILDIR_FS_SEP '.'
-#define MAILDIR_FS_SEP_S "."
-
 #define MAILDIR_STORAGE_NAME "maildir"
-#define SUBSCRIPTION_FILE_NAME "subscriptions"
+#define MAILDIR_SUBSCRIPTION_FILE_NAME "subscriptions"
 #define MAILDIR_INDEX_PREFIX "dovecot.index"
-#define MAILDIR_UNLINK_DIRNAME MAILDIR_FS_SEP_S"DOVECOT-TRASHED"
+#define MAILDIR_UNLINK_DIRNAME "DOVECOT-TRASHED"
 
 /* "base,S=123:2," means:
    <base> [<extra sep> <extra data> [..]] <info sep> 2 <flags sep> */
@@ -52,9 +48,11 @@
 struct maildir_storage {
 	struct index_storage storage;
 
-	const char *control_dir;
+	const char *temp_prefix;
+
 	unsigned int copy_with_hardlinks:1;
 	unsigned int save_size_in_filename:1;
+	unsigned int stat_dirs:1;
 };
 
 struct maildir_mailbox {
@@ -93,14 +91,6 @@
 		       mode_t mode, const char **fname_r);
 bool maildir_filename_get_size(const char *fname, char type, uoff_t *size_r);
 
-struct mailbox_list_context *
-maildir_mailbox_list_init(struct mail_storage *storage,
-			  const char *ref, const char *mask,
-			  enum mailbox_list_flags flags);
-int maildir_mailbox_list_deinit(struct mailbox_list_context *ctx);
-struct mailbox_list *
-maildir_mailbox_list_next(struct mailbox_list_context *ctx);
-
 int maildir_sync_is_synced(struct maildir_mailbox *mbox);
 
 struct mailbox_sync_context *
@@ -146,8 +136,6 @@
 int maildir_transaction_copy_commit(struct maildir_copy_context *ctx);
 void maildir_transaction_copy_rollback(struct maildir_copy_context *ctx);
 
-const char *maildir_get_path(struct index_storage *storage, const char *name);
-
 int maildir_sync_last_commit(struct maildir_mailbox *mbox);
 
 int maildir_filename_get_flags(struct maildir_keywords_sync_ctx *ctx,

Index: maildir-uidlist.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-uidlist.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- maildir-uidlist.c	28 Jun 2006 13:10:52 -0000	1.53
+++ maildir-uidlist.c	16 Nov 2006 00:16:34 -0000	1.54
@@ -174,8 +174,7 @@
 
 	uidlist->dotlock_settings.timeout = UIDLIST_LOCK_STALE_TIMEOUT + 2;
 	uidlist->dotlock_settings.stale_timeout = UIDLIST_LOCK_STALE_TIMEOUT;
-	uidlist->dotlock_settings.temp_prefix =
-		INDEX_STORAGE(mbox->storage)->temp_prefix;
+	uidlist->dotlock_settings.temp_prefix = mbox->storage->temp_prefix;
 
 	return uidlist;
 }