Mercurial > dovecot > original-hg > dovecot-1.2

annotate src/lib-storage/list/mailbox-list-maildir-iter.c @ 9627:8c8bde0f9120 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-storage: Maildir++ mailbox listing could have given wrong flags to parent mailboxes.
author Timo Sirainen <tss@iki.fi>
date Tue, 02 Nov 2010 19:23:37 +0000
parents 00cd9aacd03c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9532
00cd9aacd03c Updated copyright notices to include year 2010.
Timo Sirainen <tss@iki.fi>
parents: 8898
diff changeset
1 /* Copyright (c) 2002-2010 Dovecot authors, see the included COPYING file */
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
2
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
3 #include "lib.h"
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
4 #include "str.h"
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
5 #include "imap-match.h"
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
6 #include "mailbox-tree.h"
5829
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
7 #include "mailbox-list-subscriptions.h"
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
8 #include "mailbox-list-maildir.h"
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
9
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
10 #include <dirent.h>
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
11
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
12 struct maildir_list_iterate_context {
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
13 struct mailbox_list_iterate_context ctx;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
14 pool_t pool;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
15
6014
92fabfda82f9 Let lib-storage handle matching namespace prefixes as well.
Timo Sirainen <tss@iki.fi>
parents: 6010
diff changeset
16 const char *dir;
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
17
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
18 struct mailbox_tree_context *tree_ctx;
5547
c03655b70b57 Moved mailbox_tree iteration code from maildir++ to common code, and rewrote
Timo Sirainen <tss@iki.fi>
parents: 5473
diff changeset
19 struct mailbox_tree_iterate_context *tree_iter;
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
20
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
21 struct mailbox_info info;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
22 };
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
23
6010
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
24 static void node_fix_parents(struct mailbox_node *node)
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
25 {
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
26 /* Fix parent nodes' children states. also if we happened to create any
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
27 of the parents, we need to mark them nonexistent. */
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
28 node = node->parent;
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
29 for (; node != NULL; node = node->parent) {
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
30 if ((node->flags & MAILBOX_MATCHED) == 0)
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
31 node->flags |= MAILBOX_NONEXISTENT;
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
32
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
33 node->flags |= MAILBOX_CHILDREN;
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
34 node->flags &= ~MAILBOX_NOCHILDREN;
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
35 }
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
36 }
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
37
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
38 static void
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
39 maildir_fill_parents(struct maildir_list_iterate_context *ctx,
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
40 struct imap_match_glob *glob, bool update_only,
9627
8c8bde0f9120 lib-storage: Maildir++ mailbox listing could have given wrong flags to parent mailboxes.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
41 string_t *mailbox)
6010
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
42 {
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
43 struct mail_namespace *ns = ctx->ctx.list->ns;
6010
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
44 struct mailbox_node *node;
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
45 const char *p, *mailbox_c;
6010
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
46 char hierarchy_sep;
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
47 bool created;
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
48 unsigned int prefix_len;
6010
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
49
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
50 if ((ctx->ctx.flags & MAILBOX_LIST_ITER_VIRTUAL_NAMES) != 0) {
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
51 hierarchy_sep = ns->sep;
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
52 prefix_len = ns->prefix_len;
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
53 } else {
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
54 hierarchy_sep = ns->real_sep;
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
55 prefix_len = 0;
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
56 }
6010
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
57
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
58 mailbox_c = str_c(mailbox);
6010
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
59 while ((p = strrchr(mailbox_c, hierarchy_sep)) != NULL) {
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
60 str_truncate(mailbox, (size_t) (p-mailbox_c));
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
61 mailbox_c = str_c(mailbox);
6573
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
62 if (imap_match(glob, mailbox_c) != IMAP_MATCH_YES)
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
63 continue;
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
64
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
65 if (prefix_len > 0 && str_len(mailbox) == prefix_len-1 &&
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
66 strncmp(mailbox_c, ns->prefix, prefix_len - 1) == 0 &&
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
67 mailbox_c[prefix_len-1] == hierarchy_sep) {
6573
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
68 /* don't return matches to namespace prefix itself */
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
69 continue;
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
70 }
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
71
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
72 created = FALSE;
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
73 node = update_only ?
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
74 mailbox_tree_lookup(ctx->tree_ctx, mailbox_c) :
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
75 mailbox_tree_get(ctx->tree_ctx, mailbox_c, &created);
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
76 if (node != NULL) {
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
77 if (created) {
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
78 /* we haven't yet seen this mailbox,
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
79 but we might see it later */
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
80 node->flags = MAILBOX_NONEXISTENT;
6010
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
81 }
6573
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
82 if (!update_only)
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
83 node->flags |= MAILBOX_MATCHED;
9627
8c8bde0f9120 lib-storage: Maildir++ mailbox listing could have given wrong flags to parent mailboxes.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
84 node->flags |= MAILBOX_CHILDREN;
6573
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
85 node->flags &= ~MAILBOX_NOCHILDREN;
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
86 node_fix_parents(node);
6010
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
87 }
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
88 }
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
89 }
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
90
7493
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
91 static void maildir_set_children(struct maildir_list_iterate_context *ctx,
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
92 string_t *mailbox)
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
93 {
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
94 struct mailbox_node *node;
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
95 const char *p, *mailbox_c;
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
96 char hierarchy_sep;
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
97
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
98 if ((ctx->ctx.flags & MAILBOX_LIST_ITER_VIRTUAL_NAMES) != 0)
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
99 hierarchy_sep = ctx->ctx.list->ns->sep;
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
100 else
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
101 hierarchy_sep = ctx->ctx.list->ns->real_sep;
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
102
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
103 /* mark the first existing parent as containing children */
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
104 mailbox_c = str_c(mailbox);
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
105 while ((p = strrchr(mailbox_c, hierarchy_sep)) != NULL) {
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
106 str_truncate(mailbox, (size_t) (p-mailbox_c));
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
107 mailbox_c = str_c(mailbox);
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
108
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
109 node = mailbox_tree_lookup(ctx->tree_ctx, mailbox_c);
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
110 if (node != NULL) {
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
111 node->flags &= ~MAILBOX_NOCHILDREN;
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
112 node->flags |= MAILBOX_CHILDREN;
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
113 break;
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
114 }
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
115 }
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
116 }
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
117
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
118 static int
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
119 maildir_fill_readdir(struct maildir_list_iterate_context *ctx,
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
120 struct imap_match_glob *glob, bool update_only)
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
121 {
6573
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
122 struct mail_namespace *ns = ctx->ctx.list->ns;
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
123 DIR *dirp;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
124 struct dirent *d;
6573
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
125 const char *mailbox_name;
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
126 string_t *mailbox;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
127 enum mailbox_info_flags flags;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
128 enum imap_match_result match;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
129 struct mailbox_node *node;
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
130 bool created, virtual_names;
6304
aa00e299dfe6 Added support for binc IMAP style IMAPdir. It doesn't support escaping, but
Timo Sirainen <tss@iki.fi>
parents: 6035
diff changeset
131 char prefix_char;
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
132 int ret;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
133
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
134 dirp = opendir(ctx->dir);
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
135 if (dirp == NULL) {
8518
1e42b631f037 Improved "Permission denied" error handling. It'll now show also the uid/gid name.
Timo Sirainen <tss@iki.fi>
parents: 8137
diff changeset
136 if (errno == EACCES) {
1e42b631f037 Improved "Permission denied" error handling. It'll now show also the uid/gid name.
Timo Sirainen <tss@iki.fi>
parents: 8137
diff changeset
137 mailbox_list_set_critical(ctx->ctx.list, "%s",
1e42b631f037 Improved "Permission denied" error handling. It'll now show also the uid/gid name.
Timo Sirainen <tss@iki.fi>
parents: 8137
diff changeset
138 mail_error_eacces_msg("opendir", ctx->dir));
1e42b631f037 Improved "Permission denied" error handling. It'll now show also the uid/gid name.
Timo Sirainen <tss@iki.fi>
parents: 8137
diff changeset
139 } else if (errno != ENOENT) {
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
140 mailbox_list_set_critical(ctx->ctx.list,
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
141 "opendir(%s) failed: %m", ctx->dir);
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
142 return -1;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
143 }
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
144 return 0;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
145 }
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
146
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
147 virtual_names = (ctx->ctx.flags & MAILBOX_LIST_ITER_VIRTUAL_NAMES) != 0;
6304
aa00e299dfe6 Added support for binc IMAP style IMAPdir. It doesn't support escaping, but
Timo Sirainen <tss@iki.fi>
parents: 6035
diff changeset
148 prefix_char =
aa00e299dfe6 Added support for binc IMAP style IMAPdir. It doesn't support escaping, but
Timo Sirainen <tss@iki.fi>
parents: 6035
diff changeset
149 strcmp(ctx->ctx.list->name, MAILBOX_LIST_NAME_IMAPDIR) != 0 ?
aa00e299dfe6 Added support for binc IMAP style IMAPdir. It doesn't support escaping, but
Timo Sirainen <tss@iki.fi>
parents: 6035
diff changeset
150 ctx->ctx.list->hierarchy_sep : '\0';
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
151
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
152 mailbox = t_str_new(PATH_MAX);
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
153 while ((d = readdir(dirp)) != NULL) {
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
154 const char *fname = d->d_name;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
155
6304
aa00e299dfe6 Added support for binc IMAP style IMAPdir. It doesn't support escaping, but
Timo Sirainen <tss@iki.fi>
parents: 6035
diff changeset
156 if (fname[0] == prefix_char)
aa00e299dfe6 Added support for binc IMAP style IMAPdir. It doesn't support escaping, but
Timo Sirainen <tss@iki.fi>
parents: 6035
diff changeset
157 mailbox_name = fname + 1;
aa00e299dfe6 Added support for binc IMAP style IMAPdir. It doesn't support escaping, but
Timo Sirainen <tss@iki.fi>
parents: 6035
diff changeset
158 else {
aa00e299dfe6 Added support for binc IMAP style IMAPdir. It doesn't support escaping, but
Timo Sirainen <tss@iki.fi>
parents: 6035
diff changeset
159 if (prefix_char != '\0' || fname[0] == '.')
aa00e299dfe6 Added support for binc IMAP style IMAPdir. It doesn't support escaping, but
Timo Sirainen <tss@iki.fi>
parents: 6035
diff changeset
160 continue;
aa00e299dfe6 Added support for binc IMAP style IMAPdir. It doesn't support escaping, but
Timo Sirainen <tss@iki.fi>
parents: 6035
diff changeset
161 mailbox_name = fname;
aa00e299dfe6 Added support for binc IMAP style IMAPdir. It doesn't support escaping, but
Timo Sirainen <tss@iki.fi>
parents: 6035
diff changeset
162 }
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
163
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
164 /* skip . and .. */
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
165 if (fname[0] == '.' &&
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
166 (fname[1] == '\0' || (fname[1] == '.' && fname[2] == '\0')))
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
167 continue;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
168
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
169 if (!virtual_names) {
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
170 str_truncate(mailbox, 0);
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
171 str_append(mailbox, mailbox_name);
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
172 mailbox_name = str_c(mailbox);
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
173 } else {
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
174 mailbox_name = mail_namespace_get_vname(ns, mailbox,
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
175 mailbox_name);
6573
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
176 }
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
177
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
178 /* make sure the pattern matches */
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
179 match = imap_match(glob, mailbox_name);
6007
cc1f4688a988 Added support for multiple mailbox list patterns.
Timo Sirainen <tss@iki.fi>
parents: 5885
diff changeset
180 if ((match & (IMAP_MATCH_YES | IMAP_MATCH_PARENT)) == 0)
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
181 continue;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
182
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
183 /* check if this is an actual mailbox */
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
184 flags = 0;
7226
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents: 7086
diff changeset
185 T_BEGIN {
6940
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6639
diff changeset
186 ret = ctx->ctx.list->v.
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6639
diff changeset
187 iter_is_mailbox(&ctx->ctx, ctx->dir, fname,
7495
7f7003bcf422 Added mailbox_name parameter to mailbox_list.iter_is_mailbox().
Timo Sirainen <tss@iki.fi>
parents: 7493
diff changeset
188 mailbox_name,
5448
beabd433cdae Moved delete/rename operations to mailbox_list API. Fixed mbox/maildir to
Timo Sirainen <tss@iki.fi>
parents: 4848
diff changeset
189 mailbox_list_get_file_type(d), &flags);
7226
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents: 7086
diff changeset
190 } T_END;
6940
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6639
diff changeset
191 if (ret <= 0) {
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6639
diff changeset
192 if (ret < 0)
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6639
diff changeset
193 return -1;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6639
diff changeset
194 continue;
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
195 }
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
196
6010
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
197 /* we know the children flags ourself, so ignore if any of
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
198 them were set. */
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
199 flags &= ~(MAILBOX_NOINFERIORS |
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
200 MAILBOX_CHILDREN | MAILBOX_NOCHILDREN);
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
201
6010
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
202 if ((match & IMAP_MATCH_PARENT) != 0) {
7226
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents: 7086
diff changeset
203 T_BEGIN {
6940
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6639
diff changeset
204 maildir_fill_parents(ctx, glob, update_only,
9627
8c8bde0f9120 lib-storage: Maildir++ mailbox listing could have given wrong flags to parent mailboxes.
Timo Sirainen <tss@iki.fi>
parents: 9532
diff changeset
205 mailbox);
7226
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents: 7086
diff changeset
206 } T_END;
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
207 } else {
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
208 created = FALSE;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
209 node = update_only ?
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
210 mailbox_tree_lookup(ctx->tree_ctx,
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
211 mailbox_name) :
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
212 mailbox_tree_get(ctx->tree_ctx,
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
213 mailbox_name, &created);
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
214
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
215 if (node != NULL) {
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
216 if (created)
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
217 node->flags = MAILBOX_NOCHILDREN;
5829
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
218 else
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
219 node->flags &= ~MAILBOX_NONEXISTENT;
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
220 if (!update_only)
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
221 node->flags |= MAILBOX_MATCHED;
6010
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
222 node->flags |= flags;
ed6c07975ccb Fixes to returning mailboxes
Timo Sirainen <tss@iki.fi>
parents: 6007
diff changeset
223 node_fix_parents(node);
7493
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
224 } else {
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
225 i_assert(update_only);
3d5379e33664 maildir++ LIST (subscribed): If listing finds a non-subscribed mailbox under
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
226 maildir_set_children(ctx, mailbox);
5829
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
227 }
5448
beabd433cdae Moved delete/rename operations to mailbox_list API. Fixed mbox/maildir to
Timo Sirainen <tss@iki.fi>
parents: 4848
diff changeset
228 }
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
229 }
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
230
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
231 if (closedir(dirp) < 0) {
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
232 mailbox_list_set_critical(ctx->ctx.list,
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
233 "readdir(%s) failed: %m", ctx->dir);
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
234 return -1;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
235 }
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
236
6573
c901bdf0db75 Fixes for listing namespaces with prefixes and real != virtual separator.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
237 if ((ns->flags & NAMESPACE_FLAG_INBOX) != 0) {
8898
aef90950d50b Shared Maildirs: Fixes to listing INBOX.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
238 /* make sure INBOX is listed */
aef90950d50b Shared Maildirs: Fixes to listing INBOX.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
239 if (!virtual_names)
aef90950d50b Shared Maildirs: Fixes to listing INBOX.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
240 mailbox_name = "INBOX";
aef90950d50b Shared Maildirs: Fixes to listing INBOX.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
241 else {
aef90950d50b Shared Maildirs: Fixes to listing INBOX.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
242 mailbox_name = mail_namespace_get_vname(ns, mailbox,
aef90950d50b Shared Maildirs: Fixes to listing INBOX.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
243 "INBOX");
aef90950d50b Shared Maildirs: Fixes to listing INBOX.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
244 }
aef90950d50b Shared Maildirs: Fixes to listing INBOX.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
245
5829
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
246 created = FALSE;
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
247 node = update_only ?
8898
aef90950d50b Shared Maildirs: Fixes to listing INBOX.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
248 mailbox_tree_lookup(ctx->tree_ctx, mailbox_name) :
aef90950d50b Shared Maildirs: Fixes to listing INBOX.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
249 mailbox_tree_get(ctx->tree_ctx, mailbox_name, &created);
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
250 if (created)
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
251 node->flags = MAILBOX_NOCHILDREN;
5842
77a399a5eb2a crashfix
Timo Sirainen <tss@iki.fi>
parents: 5841
diff changeset
252 else if (node != NULL)
4848
967de900c73a Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents: 4808
diff changeset
253 node->flags &= ~MAILBOX_NONEXISTENT;
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
254
8898
aef90950d50b Shared Maildirs: Fixes to listing INBOX.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
255 match = imap_match(glob, mailbox_name);
6007
cc1f4688a988 Added support for multiple mailbox list patterns.
Timo Sirainen <tss@iki.fi>
parents: 5885
diff changeset
256 if ((match & (IMAP_MATCH_YES | IMAP_MATCH_PARENT)) != 0) {
5829
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
257 if (!update_only)
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
258 node->flags |= MAILBOX_MATCHED;
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
259 }
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
260 }
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
261 return 0;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
262 }
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
263
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
264 struct mailbox_list_iterate_context *
6007
cc1f4688a988 Added support for multiple mailbox list patterns.
Timo Sirainen <tss@iki.fi>
parents: 5885
diff changeset
265 maildir_list_iter_init(struct mailbox_list *_list, const char *const *patterns,
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
266 enum mailbox_list_iter_flags flags)
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
267 {
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
268 struct maildir_list_iterate_context *ctx;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
269 struct imap_match_glob *glob;
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
270 char sep;
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
271 pool_t pool;
6940
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6639
diff changeset
272 int ret;
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
273
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
274 sep = (flags & MAILBOX_LIST_ITER_VIRTUAL_NAMES) != 0 ?
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
275 _list->ns->sep : _list->ns->real_sep;
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
276
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
277 pool = pool_alloconly_create("maildir_list", 1024);
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
278 ctx = p_new(pool, struct maildir_list_iterate_context, 1);
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
279 ctx->ctx.list = _list;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
280 ctx->ctx.flags = flags;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
281 ctx->pool = pool;
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
282 ctx->tree_ctx = mailbox_tree_init(sep);
8079
4e1b54eb7407 Added mailbox_list_iter_init_namespaces() for listing mailboxes from multiple namespaces.
Timo Sirainen <tss@iki.fi>
parents: 7495
diff changeset
283 ctx->info.ns = _list->ns;
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
284
6639
e1fde9940f7e Fixes to handling namespace prefixes and real!=virtual separator. Added a
Timo Sirainen <tss@iki.fi>
parents: 6632
diff changeset
285 glob = imap_match_init_multiple(pool, patterns, TRUE, sep);
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
286
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
287 ctx->dir = _list->set.root_dir;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
288
5829
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
289 if ((flags & MAILBOX_LIST_ITER_SELECT_SUBSCRIBED) != 0) {
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
290 /* Listing only subscribed mailboxes.
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
291 Flags are set later if needed. */
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
292 if (mailbox_list_subscriptions_fill(&ctx->ctx, ctx->tree_ctx,
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
293 glob, FALSE) < 0) {
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
294 ctx->ctx.failed = TRUE;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
295 return &ctx->ctx;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
296 }
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
297 }
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
298
5829
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
299 if ((flags & MAILBOX_LIST_ITER_SELECT_SUBSCRIBED) == 0 ||
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
300 (flags & MAILBOX_LIST_ITER_RETURN_NO_FLAGS) == 0) {
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
301 /* Add/update mailbox list with flags */
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
302 bool update_only =
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
303 (flags & MAILBOX_LIST_ITER_SELECT_SUBSCRIBED) != 0;
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
304
7226
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents: 7086
diff changeset
305 T_BEGIN {
6940
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6639
diff changeset
306 ret = maildir_fill_readdir(ctx, glob, update_only);
7226
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents: 7086
diff changeset
307 } T_END;
6940
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6639
diff changeset
308 if (ret < 0) {
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
309 ctx->ctx.failed = TRUE;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
310 return &ctx->ctx;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
311 }
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
312 }
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
313
5829
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
314 if ((flags & MAILBOX_LIST_ITER_RETURN_SUBSCRIBED) != 0 &&
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
315 (flags & MAILBOX_LIST_ITER_SELECT_SUBSCRIBED) == 0) {
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
316 /* we're listing all mailboxes but we want to know
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
317 \Subscribed flags */
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
318 if (mailbox_list_subscriptions_fill(&ctx->ctx, ctx->tree_ctx,
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
319 glob, TRUE) < 0) {
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
320 ctx->ctx.failed = TRUE;
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
321 return &ctx->ctx;
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
322 }
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
323 }
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
324
5547
c03655b70b57 Moved mailbox_tree iteration code from maildir++ to common code, and rewrote
Timo Sirainen <tss@iki.fi>
parents: 5473
diff changeset
325 ctx->tree_iter = mailbox_tree_iterate_init(ctx->tree_ctx, NULL,
5829
1d73153584d2 Mailbox listing API changed to support more features. Used to implement
Timo Sirainen <tss@iki.fi>
parents: 5808
diff changeset
326 MAILBOX_MATCHED);
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
327 return &ctx->ctx;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
328 }
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
329
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
330 int maildir_list_iter_deinit(struct mailbox_list_iterate_context *_ctx)
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
331 {
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
332 struct maildir_list_iterate_context *ctx =
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
333 (struct maildir_list_iterate_context *)_ctx;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
334 int ret = ctx->ctx.failed ? -1 : 0;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
335
5547
c03655b70b57 Moved mailbox_tree iteration code from maildir++ to common code, and rewrote
Timo Sirainen <tss@iki.fi>
parents: 5473
diff changeset
336 if (ctx->tree_iter != NULL)
c03655b70b57 Moved mailbox_tree iteration code from maildir++ to common code, and rewrote
Timo Sirainen <tss@iki.fi>
parents: 5473
diff changeset
337 mailbox_tree_iterate_deinit(&ctx->tree_iter);
c03655b70b57 Moved mailbox_tree iteration code from maildir++ to common code, and rewrote
Timo Sirainen <tss@iki.fi>
parents: 5473
diff changeset
338 mailbox_tree_deinit(&ctx->tree_ctx);
6428
7cad076906eb pool_unref() now takes ** pointer.
Timo Sirainen <tss@iki.fi>
parents: 6304
diff changeset
339 pool_unref(&ctx->pool);
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
340 return ret;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
341 }
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
342
5807
ec09ad1d017f mailbox_list_iter_next() returns now const pointer.
Timo Sirainen <tss@iki.fi>
parents: 5567
diff changeset
343 const struct mailbox_info *
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
344 maildir_list_iter_next(struct mailbox_list_iterate_context *_ctx)
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
345 {
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
346 struct maildir_list_iterate_context *ctx =
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
347 (struct maildir_list_iterate_context *)_ctx;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
348 struct mailbox_node *node;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
349
5547
c03655b70b57 Moved mailbox_tree iteration code from maildir++ to common code, and rewrote
Timo Sirainen <tss@iki.fi>
parents: 5473
diff changeset
350 if (ctx->ctx.failed)
c03655b70b57 Moved mailbox_tree iteration code from maildir++ to common code, and rewrote
Timo Sirainen <tss@iki.fi>
parents: 5473
diff changeset
351 return NULL;
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
352
5547
c03655b70b57 Moved mailbox_tree iteration code from maildir++ to common code, and rewrote
Timo Sirainen <tss@iki.fi>
parents: 5473
diff changeset
353 node = mailbox_tree_iterate_next(ctx->tree_iter, &ctx->info.name);
c03655b70b57 Moved mailbox_tree iteration code from maildir++ to common code, and rewrote
Timo Sirainen <tss@iki.fi>
parents: 5473
diff changeset
354 if (node == NULL)
c03655b70b57 Moved mailbox_tree iteration code from maildir++ to common code, and rewrote
Timo Sirainen <tss@iki.fi>
parents: 5473
diff changeset
355 return NULL;
4808
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
356
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
357 ctx->info.flags = node->flags;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
358 return &ctx->info;
93bc9770f938 Initial code for separation of mailbox accessing and directory layout
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
359 }