[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-save.c,
1.31, 1.32 maildir-storage.c, 1.68, 1.69 maildir-storage.h,
1.20, 1.21 maildir-sync.c, 1.8, 1.9 maildir-util.c, 1.2, 1.3
cras at procontrol.fi
cras at procontrol.fi
Sun May 2 23:32:18 EEST 2004
- Previous message: [dovecot-cvs] dovecot/src/lib-storage mail-storage-private.h, 1.1,
1.2 mail-storage.c, 1.21, 1.22 mail-storage.h, 1.64,
1.65 proxy-mailbox.c, 1.5, 1.6
- Next message: [dovecot-cvs] dovecot/src/lib-storage/index index-fetch.h, 1.15,
1.16 index-mail.c, 1.28, 1.29 index-search.c, 1.85,
1.86 index-status.c, 1.29, 1.30 index-storage.c, 1.45,
1.46 index-storage.h, 1.57, 1.58
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/dovecot/src/lib-storage/index/maildir
In directory talvi:/tmp/cvs-serv3311/lib-storage/index/maildir
Modified Files:
maildir-save.c maildir-storage.c maildir-storage.h
maildir-sync.c maildir-util.c
Log Message:
s/custom flags/keywords/
Index: maildir-save.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-save.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- maildir-save.c 27 Apr 2004 20:25:54 -0000 1.31
+++ maildir-save.c 2 May 2004 20:32:16 -0000 1.32
@@ -137,9 +137,9 @@
ctx = t->save_ctx;
mail_flags = flags->flags;
- /*FIXME:if (!index_mailbox_fix_custom_flags(ibox, &mail_flags,
- flags->custom_flags,
- flags->custom_flags_count))
+ /*FIXME:if (!index_mailbox_fix_keywords(ibox, &mail_flags,
+ flags->keywords,
+ flags->keywords_count))
return FALSE;*/
t_push();
Index: maildir-storage.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- maildir-storage.c 1 May 2004 18:30:53 -0000 1.68
+++ maildir-storage.c 2 May 2004 20:32:16 -0000 1.69
@@ -845,7 +845,7 @@
NULL, /* storage */
index_storage_is_readonly,
- index_storage_allow_new_custom_flags,
+ index_storage_allow_new_keywords,
maildir_storage_close,
index_storage_get_status,
maildir_storage_sync,
Index: maildir-storage.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- maildir-storage.h 27 Apr 2004 20:25:54 -0000 1.20
+++ maildir-storage.h 2 May 2004 20:32:16 -0000 1.21
@@ -67,9 +67,9 @@
int maildir_sync_last_commit(struct index_mailbox *ibox);
int maildir_filename_get_flags(const char *fname, enum mail_flags *flags_r,
- custom_flags_mask_t custom_flags_r);
+ keywords_mask_t keywords_r);
const char *maildir_filename_set_flags(const char *fname, enum mail_flags flags,
- custom_flags_mask_t custom_flags);
+ keywords_mask_t keywords);
unsigned int maildir_hash(const void *p);
int maildir_cmp(const void *p1, const void *p2);
Index: maildir-sync.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-sync.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- maildir-sync.c 2 May 2004 19:24:36 -0000 1.8
+++ maildir-sync.c 2 May 2004 20:32:16 -0000 1.9
@@ -226,14 +226,14 @@
const char *newpath;
enum mail_flags flags;
uint8_t flags8;
- custom_flags_mask_t custom_flags;
+ keywords_mask_t keywords;
- (void)maildir_filename_get_flags(path, &flags, custom_flags);
+ (void)maildir_filename_get_flags(path, &flags, keywords);
flags8 = flags;
- mail_index_sync_flags_apply(&ctx->sync_rec, &flags8, custom_flags);
+ mail_index_sync_flags_apply(&ctx->sync_rec, &flags8, keywords);
- newpath = maildir_filename_set_flags(path, flags8, custom_flags);
+ newpath = maildir_filename_set_flags(path, flags8, keywords);
if (rename(path, newpath) == 0) {
ibox->dirty_cur_time = ioloop_time;
return 1;
@@ -505,7 +505,7 @@
enum maildir_uidlist_rec_flag uflags;
const char *filename;
enum mail_flags flags;
- custom_flags_mask_t custom_flags;
+ keywords_mask_t keywords;
uint32_t sync_stamp;
int ret;
@@ -527,7 +527,7 @@
seq = 0;
iter = maildir_uidlist_iter_init(ibox->uidlist);
while (maildir_uidlist_iter_next(iter, &uid, &uflags, &filename)) {
- maildir_filename_get_flags(filename, &flags, custom_flags);
+ maildir_filename_get_flags(filename, &flags, keywords);
__again:
seq++;
@@ -539,7 +539,7 @@
if (seq > hdr->messages_count) {
mail_index_append(trans, uid, &seq);
mail_index_update_flags(trans, seq, MODIFY_REPLACE,
- flags, custom_flags);
+ flags, keywords);
continue;
}
@@ -572,12 +572,12 @@
continue;
}
- maildir_filename_get_flags(filename, &flags, custom_flags);
+ maildir_filename_get_flags(filename, &flags, keywords);
if ((uint8_t)flags != (rec->flags & MAIL_FLAGS_MASK) ||
- memcmp(custom_flags, rec->custom_flags,
- INDEX_CUSTOM_FLAGS_BYTE_COUNT) != 0) {
+ memcmp(keywords, rec->keywords,
+ INDEX_KEYWORDS_BYTE_COUNT) != 0) {
mail_index_update_flags(trans, seq, MODIFY_REPLACE,
- flags, custom_flags);
+ flags, keywords);
}
}
maildir_uidlist_iter_deinit(iter);
Index: maildir-util.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-util.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- maildir-util.c 1 May 2004 18:30:53 -0000 1.2
+++ maildir-util.c 2 May 2004 20:32:16 -0000 1.3
@@ -54,13 +54,13 @@
}
int maildir_filename_get_flags(const char *fname, enum mail_flags *flags_r,
- custom_flags_mask_t custom_flags_r)
+ keywords_mask_t keywords_r)
{
const char *info;
unsigned int num;
*flags_r = 0;
- memset(custom_flags_r, 0, INDEX_CUSTOM_FLAGS_BYTE_COUNT);
+ memset(keywords_r, 0, INDEX_KEYWORDS_BYTE_COUNT);
info = strchr(fname, ':');
if (info == NULL || info[1] != '2' || info[2] != ',')
@@ -85,10 +85,9 @@
break;
default:
if (*info >= 'a' && *info <= 'z') {
- /* custom flag */
+ /* keyword */
num = (*info - 'a');
- custom_flags_r[num / CHAR_BIT] |=
- num % CHAR_BIT;
+ keywords_r[num / CHAR_BIT] |= num % CHAR_BIT;
break;
}
@@ -101,20 +100,20 @@
}
const char *maildir_filename_set_flags(const char *fname, enum mail_flags flags,
- custom_flags_mask_t custom_flags)
+ keywords_mask_t keywords)
{
string_t *flags_str;
const char *info, *oldflags;
int i, nextflag;
- if (custom_flags != NULL) {
- /* see if any custom flags are given */
- for (i = 0; i < INDEX_CUSTOM_FLAGS_BYTE_COUNT; i++) {
- if (custom_flags[i] != 0)
+ if (keywords != NULL) {
+ /* see if any keywords are given */
+ for (i = 0; i < INDEX_KEYWORDS_BYTE_COUNT; i++) {
+ if (keywords[i] != 0)
break;
}
- if (i == INDEX_CUSTOM_FLAGS_BYTE_COUNT)
- custom_flags = NULL;
+ if (i == INDEX_KEYWORDS_BYTE_COUNT)
+ keywords = NULL;
}
/* remove the old :info from file name, and get the old flags */
@@ -166,13 +165,13 @@
flags &= ~MAIL_DELETED;
}
- if (custom_flags != NULL && nextflag > 'a') {
- for (i = 0; i < INDEX_CUSTOM_FLAGS_COUNT; i++) {
- if ((custom_flags[i / CHAR_BIT] &
+ if (keywords != NULL && nextflag > 'a') {
+ for (i = 0; i < INDEX_KEYWORDS_COUNT; i++) {
+ if ((keywords[i / CHAR_BIT] &
(1 << (i % CHAR_BIT))) != 0)
str_append_c(flags_str, 'a' + i);
}
- custom_flags = NULL;
+ keywords = NULL;
}
if (*oldflags == '\0' || *oldflags == ',')
- Previous message: [dovecot-cvs] dovecot/src/lib-storage mail-storage-private.h, 1.1,
1.2 mail-storage.c, 1.21, 1.22 mail-storage.h, 1.64,
1.65 proxy-mailbox.c, 1.5, 1.6
- Next message: [dovecot-cvs] dovecot/src/lib-storage/index index-fetch.h, 1.15,
1.16 index-mail.c, 1.28, 1.29 index-search.c, 1.85,
1.86 index-status.c, 1.29, 1.30 index-storage.c, 1.45,
1.46 index-storage.h, 1.57, 1.58
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the dovecot-cvs
mailing list