Mercurial > dovecot > original-hg > dovecot-1.2
annotate src/plugins/trash/trash-plugin.c @ 5187:9dd18b285223 HEAD
Minor memory allocation optimizations.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Thu, 22 Feb 2007 17:03:46 +0200 |
parents | 24f4a959a24c |
children | 519ab252f1a3 |
rev | line source |
---|---|
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1 /* Copyright (C) 2005 Timo Sirainen */ |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
2 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
3 #include "lib.h" |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
4 #include "array.h" |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
5 #include "istream.h" |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
6 #include "home-expand.h" |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
7 #include "mail-search.h" |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
8 #include "quota-private.h" |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
9 #include "quota-plugin.h" |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
10 #include "trash-plugin.h" |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
11 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
12 #include <stdlib.h> |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
13 #include <unistd.h> |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
14 #include <fcntl.h> |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
15 |
5187
9dd18b285223
Minor memory allocation optimizations.
Timo Sirainen <tss@iki.fi>
parents:
5185
diff
changeset
|
16 #define INIT_TRASH_MAILBOX_COUNT 4 |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
17 #define MAX_RETRY_COUNT 3 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
18 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
19 struct trash_mailbox { |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
20 const char *name; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
21 int priority; /* lower number = higher priority */ |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
22 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
23 struct mail_storage *storage; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
24 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
25 /* temporarily set while cleaning: */ |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
26 struct mailbox *box; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
27 struct mailbox_transaction_context *trans; |
4748
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
28 struct mail_search_arg search_arg; |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
29 struct mail_search_context *search_ctx; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
30 struct mail *mail; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
31 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
32 unsigned int mail_set:1; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
33 }; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
34 |
5185
24f4a959a24c
Added <plugin_name>_version string.
Timo Sirainen <tss@iki.fi>
parents:
5158
diff
changeset
|
35 const char *trash_plugin_version = PACKAGE_VERSION; |
24f4a959a24c
Added <plugin_name>_version string.
Timo Sirainen <tss@iki.fi>
parents:
5158
diff
changeset
|
36 |
4514
511f1f5c76fa
Changes to make trash plugin working again.
Timo Sirainen <tss@iki.fi>
parents:
4451
diff
changeset
|
37 static int (*trash_next_quota_test_alloc)(struct quota_transaction_context *, |
511f1f5c76fa
Changes to make trash plugin working again.
Timo Sirainen <tss@iki.fi>
parents:
4451
diff
changeset
|
38 uoff_t, bool *); |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
39 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
40 static pool_t config_pool; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
41 /* trash_boxes ordered by priority, highest first */ |
4451
1a35d53c18fc
Array API redesigned to work using unions. It now provides type safety
Timo Sirainen <tss@iki.fi>
parents:
4400
diff
changeset
|
42 static ARRAY_DEFINE(trash_boxes, struct trash_mailbox); |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
43 |
4748
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
44 static int sync_mailbox(struct mailbox *box) |
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
45 { |
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
46 struct mailbox_sync_context *ctx; |
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
47 struct mailbox_sync_rec sync_rec; |
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
48 |
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
49 ctx = mailbox_sync_init(box, MAILBOX_SYNC_FLAG_FULL_READ); |
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
50 while (mailbox_sync_next(ctx, &sync_rec) > 0) |
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
51 ; |
4848
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4796
diff
changeset
|
52 return mailbox_sync_deinit(&ctx, 0, NULL); |
4748
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
53 } |
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
54 |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
55 static int trash_clean_mailbox_open(struct trash_mailbox *trash) |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
56 { |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
57 trash->box = mailbox_open(trash->storage, trash->name, NULL, |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
58 MAILBOX_OPEN_KEEP_RECENT); |
5147
6b0032df7008
If trash mailbox can't be opened, don't crash.
Timo Sirainen <tss@iki.fi>
parents:
4848
diff
changeset
|
59 if (trash->box == NULL) |
6b0032df7008
If trash mailbox can't be opened, don't crash.
Timo Sirainen <tss@iki.fi>
parents:
4848
diff
changeset
|
60 return -1; |
6b0032df7008
If trash mailbox can't be opened, don't crash.
Timo Sirainen <tss@iki.fi>
parents:
4848
diff
changeset
|
61 |
4748
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
62 if (sync_mailbox(trash->box) < 0) |
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
63 return -1; |
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
64 |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
65 trash->trans = mailbox_transaction_begin(trash->box, 0); |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
66 |
4748
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
67 trash->search_ctx = mailbox_search_init(trash->trans, NULL, |
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
68 &trash->search_arg, NULL); |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
69 trash->mail = mail_alloc(trash->trans, MAIL_FETCH_PHYSICAL_SIZE | |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
70 MAIL_FETCH_RECEIVED_DATE, NULL); |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
71 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
72 return mailbox_search_next(trash->search_ctx, trash->mail); |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
73 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
74 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
75 static int trash_clean_mailbox_get_next(struct trash_mailbox *trash, |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
76 time_t *received_time_r) |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
77 { |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
78 int ret; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
79 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
80 if (!trash->mail_set) { |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
81 if (trash->box == NULL) |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
82 ret = trash_clean_mailbox_open(trash); |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
83 else |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
84 ret = mailbox_search_next(trash->search_ctx, |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
85 trash->mail); |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
86 if (ret <= 0) |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
87 return ret; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
88 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
89 trash->mail_set = TRUE; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
90 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
91 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
92 *received_time_r = mail_get_received_date(trash->mail); |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
93 return 1; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
94 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
95 |
5158
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
96 static int trash_try_clean_mails(struct quota_transaction_context *ctx, |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
97 uint64_t size_needed) |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
98 { |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
99 struct trash_mailbox *trashes; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
100 unsigned int i, j, count, oldest_idx; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
101 time_t oldest, received; |
5158
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
102 uint64_t size, size_expunged = 0, expunged_count = 0; |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
103 int ret = 0; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
104 |
4451
1a35d53c18fc
Array API redesigned to work using unions. It now provides type safety
Timo Sirainen <tss@iki.fi>
parents:
4400
diff
changeset
|
105 trashes = array_get_modifiable(&trash_boxes, &count); |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
106 for (i = 0; i < count; ) { |
4748
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
107 if (trashes[i].storage == NULL) { |
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
108 /* FIXME: this is really ugly. it'll do however until |
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
109 we get proper namespace support for lib-storage. */ |
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
110 struct mail_storage *const *storage; |
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
111 |
4796
49c9e7588de4
s/quota/quota_set/ so we don't conflict with the quota symbol already
Timo Sirainen <tss@iki.fi>
parents:
4748
diff
changeset
|
112 storage = array_idx("a_set->storages, 0); |
4748
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
113 trashes[i].storage = *storage; |
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
114 } |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
115 /* expunge oldest mails first in all trash boxes with |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
116 same priority */ |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
117 oldest_idx = count; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
118 oldest = (time_t)-1; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
119 for (j = i; j < count; j++) { |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
120 if (trashes[j].priority != trashes[j].priority) |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
121 break; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
122 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
123 ret = trash_clean_mailbox_get_next(&trashes[i], |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
124 &received); |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
125 if (ret < 0) |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
126 goto __err; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
127 if (ret > 0) { |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
128 if (oldest == (time_t)-1 || |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
129 received < oldest) { |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
130 oldest = received; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
131 oldest_idx = j; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
132 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
133 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
134 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
135 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
136 if (oldest_idx < count) { |
5158
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
137 size = mail_get_physical_size(trashes[oldest_idx].mail); |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
138 if (size == (uoff_t)-1) { |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
139 /* maybe expunged already? */ |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
140 trashes[oldest_idx].mail_set = FALSE; |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
141 continue; |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
142 } |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
143 |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
144 if (mail_expunge(trashes[oldest_idx].mail) < 0) |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
145 break; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
146 |
5158
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
147 expunged_count++; |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
148 size_expunged += size; |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
149 if (size_expunged >= size_needed) |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
150 break; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
151 trashes[oldest_idx].mail_set = FALSE; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
152 } else { |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
153 /* find more mails from next priority's mailbox */ |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
154 i = j; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
155 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
156 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
157 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
158 __err: |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
159 for (i = 0; i < count; i++) { |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
160 struct trash_mailbox *trash = &trashes[i]; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
161 |
5157
df22aec605b7
If trash mailbox couldn't be opened, don't crash later either.
Timo Sirainen <tss@iki.fi>
parents:
5147
diff
changeset
|
162 if (trash->box == NULL) |
df22aec605b7
If trash mailbox couldn't be opened, don't crash later either.
Timo Sirainen <tss@iki.fi>
parents:
5147
diff
changeset
|
163 continue; |
df22aec605b7
If trash mailbox couldn't be opened, don't crash later either.
Timo Sirainen <tss@iki.fi>
parents:
5147
diff
changeset
|
164 |
4748
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
165 trash->mail_set = FALSE; |
3879
928229f8b3e6
deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents:
3863
diff
changeset
|
166 mail_free(&trash->mail); |
928229f8b3e6
deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents:
3863
diff
changeset
|
167 (void)mailbox_search_deinit(&trash->search_ctx); |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
168 |
5158
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
169 if (size_expunged >= size_needed) { |
3879
928229f8b3e6
deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents:
3863
diff
changeset
|
170 (void)mailbox_transaction_commit(&trash->trans, |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
171 MAILBOX_SYNC_FLAG_FULL_WRITE); |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
172 } else { |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
173 /* couldn't get enough space, don't expunge anything */ |
3879
928229f8b3e6
deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents:
3863
diff
changeset
|
174 mailbox_transaction_rollback(&trash->trans); |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
175 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
176 |
3879
928229f8b3e6
deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents:
3863
diff
changeset
|
177 mailbox_close(&trash->box); |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
178 } |
5158
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
179 |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
180 if (size_expunged < size_needed) |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
181 return FALSE; |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
182 |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
183 ctx->bytes_used = ctx->bytes_used > (int64_t)size_expunged ? |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
184 ctx->bytes_used - size_expunged : 0; |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
185 ctx->count_used = ctx->count_used > (int64_t)expunged_count ? |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
186 ctx->count_used - expunged_count : 0; |
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
187 return TRUE; |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
188 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
189 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
190 static int |
4514
511f1f5c76fa
Changes to make trash plugin working again.
Timo Sirainen <tss@iki.fi>
parents:
4451
diff
changeset
|
191 trash_quota_test_alloc(struct quota_transaction_context *ctx, |
511f1f5c76fa
Changes to make trash plugin working again.
Timo Sirainen <tss@iki.fi>
parents:
4451
diff
changeset
|
192 uoff_t size, bool *too_large_r) |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
193 { |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
194 int ret, i; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
195 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
196 for (i = 0; ; i++) { |
4514
511f1f5c76fa
Changes to make trash plugin working again.
Timo Sirainen <tss@iki.fi>
parents:
4451
diff
changeset
|
197 ret = trash_next_quota_test_alloc(ctx, size, too_large_r); |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
198 if (ret != 0 || *too_large_r) |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
199 return ret; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
200 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
201 if (i == MAX_RETRY_COUNT) { |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
202 /* trash_try_clean_mails() should have returned 0 if |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
203 it couldn't get enough space, but allow retrying |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
204 it a couple of times if there was some extra space |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
205 that was needed.. */ |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
206 break; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
207 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
208 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
209 /* not enough space. try deleting some from mailbox. */ |
5158
aa9b1fec1c21
Although messages were expunged, the expunges weren't counted in that same
Timo Sirainen <tss@iki.fi>
parents:
5157
diff
changeset
|
210 ret = trash_try_clean_mails(ctx, size); |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
211 if (ret <= 0) |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
212 return 0; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
213 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
214 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
215 return 0; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
216 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
217 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
218 static int trash_mailbox_priority_cmp(const void *p1, const void *p2) |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
219 { |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
220 const struct trash_mailbox *t1 = p1, *t2 = p2; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
221 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
222 return t1->priority - t2->priority; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
223 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
224 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
225 static int read_configuration(const char *path) |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
226 { |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
227 struct istream *input; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
228 const char *line, *name; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
229 struct trash_mailbox *trash; |
4602
444edc8abef9
Don't allow giving NULL parameter to array_get() or array_get_modifiable().
Timo Sirainen <tss@iki.fi>
parents:
4596
diff
changeset
|
230 unsigned int count; |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
231 int fd; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
232 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
233 fd = open(path, O_RDONLY); |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
234 if (fd == -1) { |
4400
593523f53500
Removed hardcoded trash plugin configuration paths. Added information about
Timo Sirainen <tss@iki.fi>
parents:
4084
diff
changeset
|
235 i_error("open(%s) failed: %m", path); |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
236 return -1; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
237 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
238 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
239 p_clear(config_pool); |
5187
9dd18b285223
Minor memory allocation optimizations.
Timo Sirainen <tss@iki.fi>
parents:
5185
diff
changeset
|
240 p_array_init(&trash_boxes, config_pool, INIT_TRASH_MAILBOX_COUNT); |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
241 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
242 input = i_stream_create_file(fd, default_pool, (size_t)-1, FALSE); |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
243 while ((line = i_stream_read_next_line(input)) != NULL) { |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
244 /* <priority> <mailbox name> */ |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
245 name = strchr(line, ' '); |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
246 if (name == NULL || name[1] == '\0') |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
247 continue; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
248 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
249 trash = array_append_space(&trash_boxes); |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
250 trash->name = p_strdup(config_pool, name+1); |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
251 trash->priority = atoi(t_strdup_until(line, name)); |
4748
5fb199ed254a
Trash plugin was completely broken before.
Timo Sirainen <tss@iki.fi>
parents:
4602
diff
changeset
|
252 trash->search_arg.type = SEARCH_ALL; |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
253 } |
4070
71b8faa84ec6
Added i_stream_destroy() and o_stream_destroy() and used them instead of
Timo Sirainen <tss@iki.fi>
parents:
3879
diff
changeset
|
254 i_stream_destroy(&input); |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
255 (void)close(fd); |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
256 |
4602
444edc8abef9
Don't allow giving NULL parameter to array_get() or array_get_modifiable().
Timo Sirainen <tss@iki.fi>
parents:
4596
diff
changeset
|
257 trash = array_get_modifiable(&trash_boxes, &count); |
444edc8abef9
Don't allow giving NULL parameter to array_get() or array_get_modifiable().
Timo Sirainen <tss@iki.fi>
parents:
4596
diff
changeset
|
258 qsort(trash, count, sizeof(*trash), trash_mailbox_priority_cmp); |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
259 return 0; |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
260 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
261 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
262 void trash_plugin_init(void) |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
263 { |
4400
593523f53500
Removed hardcoded trash plugin configuration paths. Added information about
Timo Sirainen <tss@iki.fi>
parents:
4084
diff
changeset
|
264 const char *env; |
593523f53500
Removed hardcoded trash plugin configuration paths. Added information about
Timo Sirainen <tss@iki.fi>
parents:
4084
diff
changeset
|
265 |
593523f53500
Removed hardcoded trash plugin configuration paths. Added information about
Timo Sirainen <tss@iki.fi>
parents:
4084
diff
changeset
|
266 env = getenv("TRASH"); |
593523f53500
Removed hardcoded trash plugin configuration paths. Added information about
Timo Sirainen <tss@iki.fi>
parents:
4084
diff
changeset
|
267 if (env == NULL) |
593523f53500
Removed hardcoded trash plugin configuration paths. Added information about
Timo Sirainen <tss@iki.fi>
parents:
4084
diff
changeset
|
268 return; |
593523f53500
Removed hardcoded trash plugin configuration paths. Added information about
Timo Sirainen <tss@iki.fi>
parents:
4084
diff
changeset
|
269 |
4796
49c9e7588de4
s/quota/quota_set/ so we don't conflict with the quota symbol already
Timo Sirainen <tss@iki.fi>
parents:
4748
diff
changeset
|
270 if (quota_set == NULL) { |
4400
593523f53500
Removed hardcoded trash plugin configuration paths. Added information about
Timo Sirainen <tss@iki.fi>
parents:
4084
diff
changeset
|
271 i_error("trash plugin: quota plugin not initialized"); |
593523f53500
Removed hardcoded trash plugin configuration paths. Added information about
Timo Sirainen <tss@iki.fi>
parents:
4084
diff
changeset
|
272 return; |
593523f53500
Removed hardcoded trash plugin configuration paths. Added information about
Timo Sirainen <tss@iki.fi>
parents:
4084
diff
changeset
|
273 } |
593523f53500
Removed hardcoded trash plugin configuration paths. Added information about
Timo Sirainen <tss@iki.fi>
parents:
4084
diff
changeset
|
274 |
5187
9dd18b285223
Minor memory allocation optimizations.
Timo Sirainen <tss@iki.fi>
parents:
5185
diff
changeset
|
275 config_pool = pool_alloconly_create("trash config", |
9dd18b285223
Minor memory allocation optimizations.
Timo Sirainen <tss@iki.fi>
parents:
5185
diff
changeset
|
276 sizeof(trash_boxes) + |
9dd18b285223
Minor memory allocation optimizations.
Timo Sirainen <tss@iki.fi>
parents:
5185
diff
changeset
|
277 BUFFER_APPROX_SIZE + |
9dd18b285223
Minor memory allocation optimizations.
Timo Sirainen <tss@iki.fi>
parents:
5185
diff
changeset
|
278 INIT_TRASH_MAILBOX_COUNT * |
9dd18b285223
Minor memory allocation optimizations.
Timo Sirainen <tss@iki.fi>
parents:
5185
diff
changeset
|
279 (sizeof(struct trash_mailbox) + 32)); |
4400
593523f53500
Removed hardcoded trash plugin configuration paths. Added information about
Timo Sirainen <tss@iki.fi>
parents:
4084
diff
changeset
|
280 if (read_configuration(env) < 0) |
593523f53500
Removed hardcoded trash plugin configuration paths. Added information about
Timo Sirainen <tss@iki.fi>
parents:
4084
diff
changeset
|
281 return; |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
282 |
4796
49c9e7588de4
s/quota/quota_set/ so we don't conflict with the quota symbol already
Timo Sirainen <tss@iki.fi>
parents:
4748
diff
changeset
|
283 trash_next_quota_test_alloc = quota_set->test_alloc; |
49c9e7588de4
s/quota/quota_set/ so we don't conflict with the quota symbol already
Timo Sirainen <tss@iki.fi>
parents:
4748
diff
changeset
|
284 quota_set->test_alloc = trash_quota_test_alloc; |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
285 } |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
286 |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
287 void trash_plugin_deinit(void) |
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
288 { |
4796
49c9e7588de4
s/quota/quota_set/ so we don't conflict with the quota symbol already
Timo Sirainen <tss@iki.fi>
parents:
4748
diff
changeset
|
289 quota_set->test_alloc = trash_next_quota_test_alloc; |
4514
511f1f5c76fa
Changes to make trash plugin working again.
Timo Sirainen <tss@iki.fi>
parents:
4451
diff
changeset
|
290 |
4400
593523f53500
Removed hardcoded trash plugin configuration paths. Added information about
Timo Sirainen <tss@iki.fi>
parents:
4084
diff
changeset
|
291 if (config_pool != NULL) |
593523f53500
Removed hardcoded trash plugin configuration paths. Added information about
Timo Sirainen <tss@iki.fi>
parents:
4084
diff
changeset
|
292 pool_unref(config_pool); |
3738
732b62dc1976
Added beginnings of plugin infrastructure. TODO: These could be optionally
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
293 } |