[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-copy.c,1.16,1.17 maildir-expunge.c,1.9,1.10 maildir-list.c,1.6,1.7 maildir-save.c,1.13,1.14 maildir-storage.c,1.21,1.22 maildir-storage.h,1.8,1.9
cras at procontrol.fi
cras at procontrol.fi
Sun Jan 5 15:09:55 EET 2003
- Previous message: [dovecot-cvs] dovecot/src/lib-index/maildir maildir-build.c,1.17,1.18 maildir-index.c,1.20,1.21 maildir-index.h,1.12,1.13 maildir-open.c,1.13,1.14 maildir-rebuild.c,1.8,1.9 maildir-sync.c,1.23,1.24 maildir-update.c,1.14,1.15
- Next message: [dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-expunge.c,1.24,1.25 mbox-list.c,1.8,1.9 mbox-save.c,1.29,1.30 mbox-storage.c,1.29,1.30 mbox-storage.h,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/dovecot/src/lib-storage/index/maildir
In directory danu:/tmp/cvs-serv25916/src/lib-storage/index/maildir
Modified Files:
maildir-copy.c maildir-expunge.c maildir-list.c maildir-save.c
maildir-storage.c maildir-storage.h
Log Message:
Naming style changes, finally got tired of most of the typedefs. Also the
previous enum -> macro change reverted so that we don't use the highest bit
anymore, that's incompatible with old indexes so they will be rebuilt.
Index: maildir-copy.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-copy.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- maildir-copy.c 20 Dec 2002 07:53:52 -0000 1.16
+++ maildir-copy.c 5 Jan 2003 13:09:52 -0000 1.17
@@ -9,19 +9,20 @@
#include <stdlib.h>
#include <unistd.h>
-typedef struct {
- MailStorage *storage;
- IndexMailbox *dest;
+struct copy_hard_context {
+ struct mail_storage *storage;
+ struct index_mailbox *dest;
int error;
const char **custom_flags;
-} CopyHardContext;
+};
-static int copy_hard_func(MailIndex *index, MailIndexRecord *rec,
+static int copy_hard_func(struct mail_index *index,
+ struct mail_index_record *rec,
unsigned int client_seq __attr_unused__,
unsigned int idx_seq __attr_unused__, void *context)
{
- CopyHardContext *ctx = context;
- MailFlags flags;
+ struct copy_hard_context *ctx = context;
+ enum mail_flags flags;
const char *fname;
char src[PATH_MAX], dest[PATH_MAX];
@@ -60,11 +61,11 @@
}
}
-static int maildir_copy_with_hardlinks(IndexMailbox *src,
- IndexMailbox *dest,
+static int maildir_copy_with_hardlinks(struct index_mailbox *src,
+ struct index_mailbox *dest,
const char *messageset, int uidset)
{
- CopyHardContext ctx;
+ struct copy_hard_context ctx;
int ret;
if (!index_storage_sync_and_lock(src, TRUE, MAIL_LOCK_SHARED))
@@ -83,10 +84,10 @@
return ctx.error ? -1 : ret;
}
-int maildir_storage_copy(Mailbox *box, Mailbox *destbox,
+int maildir_storage_copy(struct mailbox *box, struct mailbox *destbox,
const char *messageset, int uidset)
{
- IndexMailbox *ibox = (IndexMailbox *) box;
+ struct index_mailbox *ibox = (struct index_mailbox *) box;
if (destbox->readonly) {
mail_storage_set_error(box->storage,
@@ -99,7 +100,7 @@
/* both source and destination mailbox are in maildirs and
copy_with_hardlinks option is on, do it */
switch (maildir_copy_with_hardlinks(ibox,
- (IndexMailbox *) destbox, messageset, uidset)) {
+ (struct index_mailbox *) destbox, messageset, uidset)) {
case 1:
return TRUE;
case 0:
Index: maildir-expunge.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-expunge.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- maildir-expunge.c 20 Dec 2002 07:53:52 -0000 1.9
+++ maildir-expunge.c 5 Jan 2003 13:09:52 -0000 1.10
@@ -5,7 +5,8 @@
#include <unistd.h>
-static int expunge_msg(IndexMailbox *ibox, MailIndexRecord *rec)
+static int expunge_msg(struct index_mailbox *ibox,
+ struct mail_index_record *rec)
{
const char *fname;
char path[PATH_MAX];
@@ -34,9 +35,9 @@
return TRUE;
}
-int maildir_expunge_locked(IndexMailbox *ibox, int notify)
+int maildir_expunge_locked(struct index_mailbox *ibox, int notify)
{
- MailIndexRecord *rec;
+ struct mail_index_record *rec;
unsigned int seq;
if (!index_expunge_seek_first(ibox, &seq, &rec))
Index: maildir-list.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-list.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- maildir-list.c 21 Dec 2002 12:13:58 -0000 1.6
+++ maildir-list.c 5 Jan 2003 13:09:52 -0000 1.7
@@ -11,12 +11,12 @@
#include <dirent.h>
#include <sys/stat.h>
-typedef struct {
+struct find_subscribed_context {
MailboxFunc func;
void *context;
-} FindSubscribedContext;
+};
-static MailboxFlags
+static enum mailbox_flags
maildir_get_marked_flags_from(const char *dir, time_t index_stamp)
{
struct stat st;
@@ -44,8 +44,8 @@
return st.st_mtime <= cur_stamp ? MAILBOX_UNMARKED : MAILBOX_MARKED;
}
-static MailboxFlags
-maildir_get_marked_flags(MailStorage *storage, const char *dir)
+static enum mailbox_flags
+maildir_get_marked_flags(struct mail_storage *storage, const char *dir)
{
const char *path;
struct stat st;
@@ -71,14 +71,14 @@
return maildir_get_marked_flags_from(dir, st.st_mtime);
}
-int maildir_find_mailboxes(MailStorage *storage, const char *mask,
+int maildir_find_mailboxes(struct mail_storage *storage, const char *mask,
MailboxFunc func, void *context)
{
- ImapMatchGlob *glob;
+ struct imap_match_glob *glob;
DIR *dirp;
struct dirent *d;
struct stat st;
- MailboxFlags flags;
+ enum mailbox_flags flags;
char path[PATH_MAX];
int failed, found_inbox;
@@ -155,11 +155,11 @@
return !failed;
}
-static int maildir_subs_func(MailStorage *storage, const char *name,
+static int maildir_subs_func(struct mail_storage *storage, const char *name,
void *context)
{
- FindSubscribedContext *ctx = context;
- MailboxFlags flags;
+ struct find_subscribed_context *ctx = context;
+ enum mailbox_flags flags;
struct stat st;
char path[PATH_MAX];
@@ -176,10 +176,10 @@
return TRUE;
}
-int maildir_find_subscribed(MailStorage *storage, const char *mask,
+int maildir_find_subscribed(struct mail_storage *storage, const char *mask,
MailboxFunc func, void *context)
{
- FindSubscribedContext ctx;
+ struct find_subscribed_context ctx;
ctx.func = func;
ctx.context = context;
Index: maildir-save.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-save.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- maildir-save.c 20 Dec 2002 07:53:52 -0000 1.13
+++ maildir-save.c 5 Jan 2003 13:09:52 -0000 1.14
@@ -22,7 +22,7 @@
my_pid, create_count++, my_hostname);
}
-static int maildir_create_tmp(MailStorage *storage, const char *dir,
+static int maildir_create_tmp(struct mail_storage *storage, const char *dir,
const char **fname)
{
const char *path;
@@ -47,11 +47,12 @@
return fd;
}
-static const char *maildir_read_into_tmp(MailStorage *storage, const char *dir,
- IStream *input, uoff_t data_size)
+static const char *
+maildir_read_into_tmp(struct mail_storage *storage, const char *dir,
+ struct istream *input, uoff_t data_size)
{
const char *fname, *path;
- OStream *output;
+ struct ostream *output;
int fd;
fd = maildir_create_tmp(storage, dir, &fname);
@@ -77,12 +78,12 @@
return fname;
}
-int maildir_storage_save(Mailbox *box, MailFlags flags,
+int maildir_storage_save(struct mailbox *box, enum mail_flags flags,
const char *custom_flags[], time_t internal_date,
int timezone_offset __attr_unused__,
- IStream *data, uoff_t data_size)
+ struct istream *data, uoff_t data_size)
{
- IndexMailbox *ibox = (IndexMailbox *) box;
+ struct index_mailbox *ibox = (struct index_mailbox *) box;
struct utimbuf buf;
const char *tmpdir, *fname, *tmp_path, *new_path;
int failed;
Index: maildir-storage.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- maildir-storage.c 2 Jan 2003 10:21:41 -0000 1.21
+++ maildir-storage.c 5 Jan 2003 13:09:52 -0000 1.22
@@ -13,20 +13,20 @@
#define CREATE_MODE 0770 /* umask() should limit it more */
-typedef struct {
+struct rename_context {
int found;
size_t oldnamelen;
const char *newname;
-} RenameContext;
+};
-extern MailStorage maildir_storage;
-extern Mailbox maildir_mailbox;
+extern struct mail_storage maildir_storage;
+extern struct mailbox maildir_mailbox;
static const char *maildirs[] = { "cur", "new", "tmp", NULL };
-static MailStorage *maildir_create(const char *data, const char *user)
+static struct mail_storage *maildir_create(const char *data, const char *user)
{
- MailStorage *storage;
+ struct mail_storage *storage;
const char *home, *path, *root_dir, *index_dir, *p;
root_dir = index_dir = NULL;
@@ -65,17 +65,17 @@
if (index_dir == NULL)
index_dir = root_dir;
- storage = i_new(MailStorage, 1);
- memcpy(storage, &maildir_storage, sizeof(MailStorage));
+ storage = i_new(struct mail_storage, 1);
+ memcpy(storage, &maildir_storage, sizeof(struct mail_storage));
storage->dir = i_strdup(root_dir);
storage->index_dir = i_strdup(index_dir);
storage->user = i_strdup(user);
- storage->callbacks = i_new(MailStorageCallbacks, 1);
+ storage->callbacks = i_new(struct mail_storage_callbacks, 1);
return storage;
}
-static void maildir_free(MailStorage *storage)
+static void maildir_free(struct mail_storage *storage)
{
i_free(storage->dir);
i_free(storage->index_dir);
@@ -93,7 +93,7 @@
S_ISDIR(st.st_mode);
}
-static int maildir_is_valid_name(MailStorage *storage, const char *name)
+static int maildir_is_valid_name(struct mail_storage *storage, const char *name)
{
return name[0] != '\0' && name[0] != storage->hierarchy_sep &&
name[strlen(name)-1] != storage->hierarchy_sep &&
@@ -101,7 +101,8 @@
strchr(name, '*') == NULL && strchr(name, '%') == NULL;
}
-static const char *maildir_get_path(MailStorage *storage, const char *name)
+static const char *maildir_get_path(struct mail_storage *storage,
+ const char *name)
{
return t_strconcat(storage->dir, "/.", name, NULL);
}
@@ -125,7 +126,7 @@
return TRUE;
}
-static int create_index_dir(MailStorage *storage, const char *name)
+static int create_index_dir(struct mail_storage *storage, const char *name)
{
const char *dir;
@@ -142,7 +143,7 @@
return TRUE;
}
-static int verify_inbox(MailStorage *storage)
+static int verify_inbox(struct mail_storage *storage)
{
const char **tmp, *src, *dest, *inbox;
@@ -173,11 +174,12 @@
return create_index_dir(storage, "INBOX");
}
-static Mailbox *maildir_open(MailStorage *storage, const char *name,
- int readonly, int fast)
+static struct mailbox *
+maildir_open(struct mail_storage *storage, const char *name,
+ int readonly, int fast)
{
- IndexMailbox *ibox;
- MailIndex *index;
+ struct index_mailbox *ibox;
+ struct mail_index *index;
const char *path, *index_dir;
path = t_strconcat(storage->dir, "/.", name, NULL);
@@ -195,10 +197,11 @@
ibox->expunge_locked = maildir_expunge_locked;
index_mailbox_check_add(ibox, t_strconcat(path, "/new", NULL));
}
- return (Mailbox *) ibox;
+ return (struct mailbox *) ibox;
}
-static const char *inbox_fix_case(MailStorage *storage, const char *name)
+static const char *inbox_fix_case(struct mail_storage *storage,
+ const char *name)
{
if (strncasecmp(name, "INBOX", 5) == 0 &&
(name[5] == '\0' || name[5] == storage->hierarchy_sep)) {
@@ -210,8 +213,9 @@
return name;
}
-static Mailbox *maildir_open_mailbox(MailStorage *storage, const char *name,
- int readonly, int fast)
+static struct mailbox *
+maildir_open_mailbox(struct mail_storage *storage,
+ const char *name, int readonly, int fast)
{
const char *path;
struct stat st;
@@ -250,7 +254,8 @@
}
}
-static int maildir_create_mailbox(MailStorage *storage, const char *name)
+static int maildir_create_mailbox(struct mail_storage *storage,
+ const char *name)
{
const char *path;
@@ -275,7 +280,8 @@
}
}
-static int maildir_delete_mailbox(MailStorage *storage, const char *name)
+static int maildir_delete_mailbox(struct mail_storage *storage,
+ const char *name)
{
struct stat st;
const char *src, *dest, *index_dir;
@@ -343,7 +349,7 @@
return TRUE;
}
-static int move_inbox_data(MailStorage *storage, const char *newdir)
+static int move_inbox_data(struct mail_storage *storage, const char *newdir)
{
const char **tmp, *oldpath, *newpath;
@@ -374,7 +380,7 @@
return TRUE;
}
-static int rename_indexes(MailStorage *storage,
+static int rename_indexes(struct mail_storage *storage,
const char *oldname, const char *newname)
{
const char *oldpath, *newpath;
@@ -395,10 +401,11 @@
return TRUE;
}
-static void rename_subfolder(MailStorage *storage, const char *name,
- MailboxFlags flags __attr_unused__, void *context)
+static void rename_subfolder(struct mail_storage *storage, const char *name,
+ enum mailbox_flags flags __attr_unused__,
+ void *context)
{
- RenameContext *ctx = context;
+ struct rename_context *ctx = context;
const char *newname, *oldpath, *newpath;
i_assert(ctx->oldnamelen <= strlen(name));
@@ -425,10 +432,10 @@
(void)rename_indexes(storage, name, newname);
}
-static int maildir_rename_mailbox(MailStorage *storage, const char *oldname,
- const char *newname)
+static int maildir_rename_mailbox(struct mail_storage *storage,
+ const char *oldname, const char *newname)
{
- RenameContext ctx;
+ struct rename_context ctx;
const char *oldpath, *newpath;
int ret;
@@ -485,9 +492,9 @@
}
}
-static int maildir_get_mailbox_name_status(MailStorage *storage,
+static int maildir_get_mailbox_name_status(struct mail_storage *storage,
const char *name,
- MailboxNameStatus *status)
+ enum mailbox_name_status *status)
{
struct stat st;
const char *path;
@@ -514,7 +521,7 @@
}
}
-MailStorage maildir_storage = {
+struct mail_storage maildir_storage = {
"maildir", /* name */
'.', /* hierarchy_sep - can't be changed */
@@ -543,7 +550,7 @@
0
};
-Mailbox maildir_mailbox = {
+struct mailbox maildir_mailbox = {
NULL, /* name */
NULL, /* storage */
Index: maildir-storage.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- maildir-storage.h 6 Dec 2002 01:09:23 -0000 1.8
+++ maildir-storage.h 5 Jan 2003 13:09:52 -0000 1.9
@@ -3,19 +3,19 @@
#include "index-storage.h"
-int maildir_storage_copy(Mailbox *box, Mailbox *destbox,
+int maildir_storage_copy(struct mailbox *box, struct mailbox *destbox,
const char *messageset, int uidset);
-int maildir_storage_save(Mailbox *box, MailFlags flags,
+int maildir_storage_save(struct mailbox *box, enum mail_flags flags,
const char *custom_flags[],
time_t internal_date, int timezone_offset,
- IStream *data, uoff_t data_size);
+ struct istream *data, uoff_t data_size);
-int maildir_find_mailboxes(MailStorage *storage, const char *mask,
+int maildir_find_mailboxes(struct mail_storage *storage, const char *mask,
MailboxFunc func, void *context);
-int maildir_find_subscribed(MailStorage *storage, const char *mask,
+int maildir_find_subscribed(struct mail_storage *storage, const char *mask,
MailboxFunc func, void *context);
-int maildir_expunge_locked(IndexMailbox *ibox, int notify);
+int maildir_expunge_locked(struct index_mailbox *ibox, int notify);
/* Return new filename base to save into tmp/ */
const char *maildir_generate_tmp_filename(void);
- Previous message: [dovecot-cvs] dovecot/src/lib-index/maildir maildir-build.c,1.17,1.18 maildir-index.c,1.20,1.21 maildir-index.h,1.12,1.13 maildir-open.c,1.13,1.14 maildir-rebuild.c,1.8,1.9 maildir-sync.c,1.23,1.24 maildir-update.c,1.14,1.15
- Next message: [dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-expunge.c,1.24,1.25 mbox-list.c,1.8,1.9 mbox-save.c,1.29,1.30 mbox-storage.c,1.29,1.30 mbox-storage.h,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the dovecot-cvs
mailing list