Mercurial > dovecot > core-2.2
annotate src/lib-storage/index/mbox/mbox-save.c @ 6302:a8d5d826318b HEAD
Call mail_alloc/mail_free, not index_mail_alloc/index_mail/free directly.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Thu, 16 Aug 2007 17:35:45 +0300 |
parents | 5f66277bbe40 |
children | 83357f65cca4 |
rev | line source |
---|---|
5167
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
1 /* Copyright (C) 2002-2007 Timo Sirainen */ |
0 | 2 |
3 #include "lib.h" | |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
4 #include "ioloop.h" |
3470
346a494c2feb
Moved array declaration to array-decl.h and include it in lib.h. So array.h
Timo Sirainen <tss@iki.fi>
parents:
3464
diff
changeset
|
5 #include "array.h" |
5167
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
6 #include "base64.h" |
0 | 7 #include "hostpid.h" |
5167
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
8 #include "randgen.h" |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
9 #include "istream.h" |
764
f57c52738f90
Renamed IBuffer and OBuffer to IStream and OStream which describes their
Timo Sirainen <tss@iki.fi>
parents:
674
diff
changeset
|
10 #include "ostream.h" |
1209
539b7336b68a
mbox: strip some headers when saving message. also always set Content-Length
Timo Sirainen <tss@iki.fi>
parents:
1039
diff
changeset
|
11 #include "str.h" |
29
e9375147c0cb
Added write_full() which is a simple wrapper around write() meant for
Timo Sirainen <tss@iki.fi>
parents:
22
diff
changeset
|
12 #include "write-full.h" |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
13 #include "istream-header-filter.h" |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
14 #include "ostream-crlf.h" |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
15 #include "message-parser.h" |
3464
0661239a7034
Cache mail headers when saving mails to mbox. We should cache everything,
Timo Sirainen <tss@iki.fi>
parents:
3348
diff
changeset
|
16 #include "index-mail.h" |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
17 #include "mbox-storage.h" |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
18 #include "mbox-file.h" |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
19 #include "mbox-from.h" |
0 | 20 #include "mbox-lock.h" |
2973
32cc9186d8eb
If we want MD5 sums in indexes, mail saving should also add them.
Timo Sirainen <tss@iki.fi>
parents:
2892
diff
changeset
|
21 #include "mbox-md5.h" |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
22 #include "mbox-sync-private.h" |
0 | 23 |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
24 #include <stddef.h> |
0 | 25 #include <stdlib.h> |
26 #include <unistd.h> | |
27 #include <fcntl.h> | |
521
83da62e0675a
mbox locking fixes / changes. we now read-lock the mbox file before syncing
Timo Sirainen <tss@iki.fi>
parents:
492
diff
changeset
|
28 #include <sys/stat.h> |
22
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
29 #include <netdb.h> |
5741
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
30 #include <utime.h> |
22
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
31 |
5167
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
32 #define MBOX_DELIVERY_ID_RAND_BYTES (64/8) |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
33 |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
34 struct mbox_save_context { |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
35 struct mail_save_context ctx; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
36 |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
37 struct mbox_mailbox *mbox; |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
38 struct mail_index_transaction *trans; |
3464
0661239a7034
Cache mail headers when saving mails to mbox. We should cache everything,
Timo Sirainen <tss@iki.fi>
parents:
3348
diff
changeset
|
39 struct mail *mail; |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
40 uoff_t append_offset, mail_offset; |
5741
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
41 time_t orig_atime; |
6265
0ee2b0691f3e
Cache received date, sent date, save date and physical size when saving
Timo Sirainen <tss@iki.fi>
parents:
6161
diff
changeset
|
42 time_t received_date; |
1015
40a327d356de
Support for MULTIAPPEND extension. COPY now behaves like spec says - if it
Timo Sirainen <tss@iki.fi>
parents:
988
diff
changeset
|
43 |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
44 string_t *headers; |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
45 size_t space_end_idx; |
5592 | 46 uint32_t seq, next_uid, uid_validity, first_saved_uid; |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
47 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
48 struct istream *input; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
49 struct ostream *output, *body_output; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
50 uoff_t extra_hdr_offset, eoh_offset, eoh_input_offset; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
51 char last_char; |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
52 |
2973
32cc9186d8eb
If we want MD5 sums in indexes, mail saving should also add them.
Timo Sirainen <tss@iki.fi>
parents:
2892
diff
changeset
|
53 struct mbox_md5_context *mbox_md5_ctx; |
5580
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
54 unsigned int x_delivery_id_pos; |
1209
539b7336b68a
mbox: strip some headers when saving message. also always set Content-Length
Timo Sirainen <tss@iki.fi>
parents:
1039
diff
changeset
|
55 |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
56 unsigned int synced:1; |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
57 unsigned int failed:1; |
4044
da1d65e064f8
mailbox_save_init() supports now returning failure. Quota plugin now checks
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3879
diff
changeset
|
58 unsigned int finished:1; |
1015
40a327d356de
Support for MULTIAPPEND extension. COPY now behaves like spec says - if it
Timo Sirainen <tss@iki.fi>
parents:
988
diff
changeset
|
59 }; |
40a327d356de
Support for MULTIAPPEND extension. COPY now behaves like spec says - if it
Timo Sirainen <tss@iki.fi>
parents:
988
diff
changeset
|
60 |
22
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
61 static char my_hostdomain[256] = ""; |
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
62 |
5281
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
63 static int write_error(struct mbox_save_context *ctx) |
223
ca6967899c05
More cleanups. lib-storage should handle "out of disk space" conditions
Timo Sirainen <tss@iki.fi>
parents:
184
diff
changeset
|
64 { |
5613 | 65 mbox_set_syscall_error(ctx->mbox, "write()"); |
3348
34dea04a191e
Crashfix for some failure handling.
Timo Sirainen <tss@iki.fi>
parents:
3322
diff
changeset
|
66 ctx->failed = TRUE; |
5281
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
67 return -1; |
223
ca6967899c05
More cleanups. lib-storage should handle "out of disk space" conditions
Timo Sirainen <tss@iki.fi>
parents:
184
diff
changeset
|
68 } |
ca6967899c05
More cleanups. lib-storage should handle "out of disk space" conditions
Timo Sirainen <tss@iki.fi>
parents:
184
diff
changeset
|
69 |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
70 static int mbox_seek_to_end(struct mbox_save_context *ctx, uoff_t *offset) |
223
ca6967899c05
More cleanups. lib-storage should handle "out of disk space" conditions
Timo Sirainen <tss@iki.fi>
parents:
184
diff
changeset
|
71 { |
521
83da62e0675a
mbox locking fixes / changes. we now read-lock the mbox file before syncing
Timo Sirainen <tss@iki.fi>
parents:
492
diff
changeset
|
72 struct stat st; |
223
ca6967899c05
More cleanups. lib-storage should handle "out of disk space" conditions
Timo Sirainen <tss@iki.fi>
parents:
184
diff
changeset
|
73 char ch; |
1015
40a327d356de
Support for MULTIAPPEND extension. COPY now behaves like spec says - if it
Timo Sirainen <tss@iki.fi>
parents:
988
diff
changeset
|
74 int fd; |
223
ca6967899c05
More cleanups. lib-storage should handle "out of disk space" conditions
Timo Sirainen <tss@iki.fi>
parents:
184
diff
changeset
|
75 |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
76 if (ctx->mbox->mbox_writeonly) { |
2986
51a05fd00324
Named pipes are now treated as write-only mboxes.
Timo Sirainen <tss@iki.fi>
parents:
2978
diff
changeset
|
77 *offset = 0; |
51a05fd00324
Named pipes are now treated as write-only mboxes.
Timo Sirainen <tss@iki.fi>
parents:
2978
diff
changeset
|
78 return 0; |
51a05fd00324
Named pipes are now treated as write-only mboxes.
Timo Sirainen <tss@iki.fi>
parents:
2978
diff
changeset
|
79 } |
51a05fd00324
Named pipes are now treated as write-only mboxes.
Timo Sirainen <tss@iki.fi>
parents:
2978
diff
changeset
|
80 |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
81 fd = ctx->mbox->mbox_fd; |
1209
539b7336b68a
mbox: strip some headers when saving message. also always set Content-Length
Timo Sirainen <tss@iki.fi>
parents:
1039
diff
changeset
|
82 if (fstat(fd, &st) < 0) |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
83 return mbox_set_syscall_error(ctx->mbox, "fstat()"); |
521
83da62e0675a
mbox locking fixes / changes. we now read-lock the mbox file before syncing
Timo Sirainen <tss@iki.fi>
parents:
492
diff
changeset
|
84 |
5741
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
85 ctx->orig_atime = st.st_atime; |
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
86 |
1039
793f05a7e50e
signed/unsigned/const pointer fixes
Timo Sirainen <tss@iki.fi>
parents:
1030
diff
changeset
|
87 *offset = (uoff_t)st.st_size; |
521
83da62e0675a
mbox locking fixes / changes. we now read-lock the mbox file before syncing
Timo Sirainen <tss@iki.fi>
parents:
492
diff
changeset
|
88 if (st.st_size == 0) |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
89 return 0; |
223
ca6967899c05
More cleanups. lib-storage should handle "out of disk space" conditions
Timo Sirainen <tss@iki.fi>
parents:
184
diff
changeset
|
90 |
1209
539b7336b68a
mbox: strip some headers when saving message. also always set Content-Length
Timo Sirainen <tss@iki.fi>
parents:
1039
diff
changeset
|
91 if (lseek(fd, st.st_size-1, SEEK_SET) < 0) |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
92 return mbox_set_syscall_error(ctx->mbox, "lseek()"); |
223
ca6967899c05
More cleanups. lib-storage should handle "out of disk space" conditions
Timo Sirainen <tss@iki.fi>
parents:
184
diff
changeset
|
93 |
1209
539b7336b68a
mbox: strip some headers when saving message. also always set Content-Length
Timo Sirainen <tss@iki.fi>
parents:
1039
diff
changeset
|
94 if (read(fd, &ch, 1) != 1) |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
95 return mbox_set_syscall_error(ctx->mbox, "read()"); |
223
ca6967899c05
More cleanups. lib-storage should handle "out of disk space" conditions
Timo Sirainen <tss@iki.fi>
parents:
184
diff
changeset
|
96 |
521
83da62e0675a
mbox locking fixes / changes. we now read-lock the mbox file before syncing
Timo Sirainen <tss@iki.fi>
parents:
492
diff
changeset
|
97 if (ch != '\n') { |
5281
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
98 if (write_full(fd, "\n", 1) < 0) |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
99 return write_error(ctx); |
1015
40a327d356de
Support for MULTIAPPEND extension. COPY now behaves like spec says - if it
Timo Sirainen <tss@iki.fi>
parents:
988
diff
changeset
|
100 *offset += 1; |
521
83da62e0675a
mbox locking fixes / changes. we now read-lock the mbox file before syncing
Timo Sirainen <tss@iki.fi>
parents:
492
diff
changeset
|
101 } |
223
ca6967899c05
More cleanups. lib-storage should handle "out of disk space" conditions
Timo Sirainen <tss@iki.fi>
parents:
184
diff
changeset
|
102 |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
103 return 0; |
223
ca6967899c05
More cleanups. lib-storage should handle "out of disk space" conditions
Timo Sirainen <tss@iki.fi>
parents:
184
diff
changeset
|
104 } |
ca6967899c05
More cleanups. lib-storage should handle "out of disk space" conditions
Timo Sirainen <tss@iki.fi>
parents:
184
diff
changeset
|
105 |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
106 static int mbox_append_lf(struct mbox_save_context *ctx) |
266
757c32a1920d
expunging last message from mbox duplicated the whole file. appending mail
Timo Sirainen <tss@iki.fi>
parents:
223
diff
changeset
|
107 { |
5281
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
108 if (o_stream_send(ctx->output, "\n", 1) < 0) |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
109 return write_error(ctx); |
266
757c32a1920d
expunging last message from mbox duplicated the whole file. appending mail
Timo Sirainen <tss@iki.fi>
parents:
223
diff
changeset
|
110 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
111 return 0; |
266
757c32a1920d
expunging last message from mbox duplicated the whole file. appending mail
Timo Sirainen <tss@iki.fi>
parents:
223
diff
changeset
|
112 } |
757c32a1920d
expunging last message from mbox duplicated the whole file. appending mail
Timo Sirainen <tss@iki.fi>
parents:
223
diff
changeset
|
113 |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
114 static int write_from_line(struct mbox_save_context *ctx, time_t received_date, |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
115 const char *from_envelope) |
22
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
116 { |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
117 const char *line, *name; |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
118 int ret; |
22
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
119 |
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
120 if (*my_hostdomain == '\0') { |
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
121 struct hostent *hent; |
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
122 |
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
123 hent = gethostbyname(my_hostname); |
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
124 |
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
125 name = hent != NULL ? hent->h_name : NULL; |
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
126 if (name == NULL) { |
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
127 /* failed, use just the hostname */ |
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
128 name = my_hostname; |
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
129 } |
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
130 |
809
27554afad17e
Limit the mailbox path. A few cleanups.
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
131 strocpy(my_hostdomain, name, sizeof(my_hostdomain)); |
22
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
132 } |
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
133 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
134 t_push(); |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
135 if (from_envelope == NULL) { |
3280
2c72492dfd91
Created mbox_storage and maildir_storage.
Timo Sirainen <tss@iki.fi>
parents:
3279
diff
changeset
|
136 from_envelope = |
5459
78eaf595359c
Removed struct index_storage abstraction. It's pointless.
Timo Sirainen <tss@iki.fi>
parents:
5281
diff
changeset
|
137 t_strconcat(ctx->mbox->storage->storage.user, |
3280
2c72492dfd91
Created mbox_storage and maildir_storage.
Timo Sirainen <tss@iki.fi>
parents:
3279
diff
changeset
|
138 "@", my_hostdomain, NULL); |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
139 } |
22
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
140 |
492
efa46e28a0d7
Fixes to timezone handling which were handling quite badly. added
Timo Sirainen <tss@iki.fi>
parents:
472
diff
changeset
|
141 /* save in local timezone, no matter what it was given with */ |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
142 line = mbox_from_create(from_envelope, received_date); |
22
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
143 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
144 if ((ret = o_stream_send_str(ctx->output, line)) < 0) |
5281
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
145 write_error(ctx); |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
146 t_pop(); |
314
d2a305fa0ec2
mbox ignored message flags for APPEND.
Timo Sirainen <tss@iki.fi>
parents:
305
diff
changeset
|
147 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
148 return ret; |
314
d2a305fa0ec2
mbox ignored message flags for APPEND.
Timo Sirainen <tss@iki.fi>
parents:
305
diff
changeset
|
149 } |
d2a305fa0ec2
mbox ignored message flags for APPEND.
Timo Sirainen <tss@iki.fi>
parents:
305
diff
changeset
|
150 |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
151 static int mbox_write_content_length(struct mbox_save_context *ctx) |
314
d2a305fa0ec2
mbox ignored message flags for APPEND.
Timo Sirainen <tss@iki.fi>
parents:
305
diff
changeset
|
152 { |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
153 uoff_t end_offset; |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
154 const char *str; |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
155 size_t len; |
1209
539b7336b68a
mbox: strip some headers when saving message. also always set Content-Length
Timo Sirainen <tss@iki.fi>
parents:
1039
diff
changeset
|
156 |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
157 if (ctx->mbox->mbox_writeonly) { |
2986
51a05fd00324
Named pipes are now treated as write-only mboxes.
Timo Sirainen <tss@iki.fi>
parents:
2978
diff
changeset
|
158 /* we can't seek, don't set Content-Length */ |
51a05fd00324
Named pipes are now treated as write-only mboxes.
Timo Sirainen <tss@iki.fi>
parents:
2978
diff
changeset
|
159 return 0; |
51a05fd00324
Named pipes are now treated as write-only mboxes.
Timo Sirainen <tss@iki.fi>
parents:
2978
diff
changeset
|
160 } |
51a05fd00324
Named pipes are now treated as write-only mboxes.
Timo Sirainen <tss@iki.fi>
parents:
2978
diff
changeset
|
161 |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
162 end_offset = ctx->output->offset; |
1209
539b7336b68a
mbox: strip some headers when saving message. also always set Content-Length
Timo Sirainen <tss@iki.fi>
parents:
1039
diff
changeset
|
163 |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
164 /* write Content-Length headers */ |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
165 str = t_strdup_printf("\nContent-Length: %s", |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
166 dec2str(end_offset - ctx->eoh_offset)); |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
167 len = strlen(str); |
1209
539b7336b68a
mbox: strip some headers when saving message. also always set Content-Length
Timo Sirainen <tss@iki.fi>
parents:
1039
diff
changeset
|
168 |
5281
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
169 /* flush manually here so that we don't confuse seek() errors with |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
170 buffer flushing errors */ |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
171 if (o_stream_flush(ctx->output) < 0) |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
172 return write_error(ctx); |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
173 if (o_stream_seek(ctx->output, ctx->extra_hdr_offset + |
5281
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
174 ctx->space_end_idx - len) < 0) |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
175 return mbox_set_syscall_error(ctx->mbox, "o_stream_seek()"); |
1209
539b7336b68a
mbox: strip some headers when saving message. also always set Content-Length
Timo Sirainen <tss@iki.fi>
parents:
1039
diff
changeset
|
176 |
5281
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
177 if (o_stream_send(ctx->output, str, len) < 0 || |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
178 o_stream_flush(ctx->output) < 0) |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
179 return write_error(ctx); |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
180 |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
181 if (o_stream_seek(ctx->output, end_offset) < 0) |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
182 return mbox_set_syscall_error(ctx->mbox, "o_stream_seek()"); |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
183 return 0; |
1209
539b7336b68a
mbox: strip some headers when saving message. also always set Content-Length
Timo Sirainen <tss@iki.fi>
parents:
1039
diff
changeset
|
184 } |
539b7336b68a
mbox: strip some headers when saving message. also always set Content-Length
Timo Sirainen <tss@iki.fi>
parents:
1039
diff
changeset
|
185 |
2892
62d53b49110d
Changed mail_index_get_header() to return the header as return value because
Timo Sirainen <tss@iki.fi>
parents:
2877
diff
changeset
|
186 static void mbox_save_init_sync(struct mbox_transaction_context *t) |
1209
539b7336b68a
mbox: strip some headers when saving message. also always set Content-Length
Timo Sirainen <tss@iki.fi>
parents:
1039
diff
changeset
|
187 { |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
188 struct mbox_mailbox *mbox = (struct mbox_mailbox *)t->ictx.ibox; |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
189 struct mbox_save_context *ctx = t->save_ctx; |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
190 const struct mail_index_header *hdr; |
3221
af8fc972fe95
If want_mail = TRUE for mbox_save_init() and we sync the mbox, we'll have to
Timo Sirainen <tss@iki.fi>
parents:
3209
diff
changeset
|
191 struct mail_index_view *view; |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
192 |
3221
af8fc972fe95
If want_mail = TRUE for mbox_save_init() and we sync the mbox, we'll have to
Timo Sirainen <tss@iki.fi>
parents:
3209
diff
changeset
|
193 /* open a new view to get the header. this is required if we just |
af8fc972fe95
If want_mail = TRUE for mbox_save_init() and we sync the mbox, we'll have to
Timo Sirainen <tss@iki.fi>
parents:
3209
diff
changeset
|
194 synced the mailbox so we can get updated next_uid. */ |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
195 view = mail_index_view_open(mbox->ibox.index); |
3221
af8fc972fe95
If want_mail = TRUE for mbox_save_init() and we sync the mbox, we'll have to
Timo Sirainen <tss@iki.fi>
parents:
3209
diff
changeset
|
196 hdr = mail_index_get_header(view); |
2892
62d53b49110d
Changed mail_index_get_header() to return the header as return value because
Timo Sirainen <tss@iki.fi>
parents:
2877
diff
changeset
|
197 |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
198 ctx->next_uid = hdr->next_uid; |
5592 | 199 ctx->first_saved_uid = ctx->next_uid; |
5124
e008f09dc3c9
When saving a message to an empty mbox file, write X-IMAPbase header so the
Timo Sirainen <tss@iki.fi>
parents:
4918
diff
changeset
|
200 ctx->uid_validity = hdr->uid_validity; |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
201 ctx->synced = TRUE; |
5572
896845fbc4ed
Added mailbox_transaction_commit_get_uids() which returns the UID range for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
202 t->mbox_modified = TRUE; |
896845fbc4ed
Added mailbox_transaction_commit_get_uids() which returns the UID range for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
203 |
3879
928229f8b3e6
deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents:
3863
diff
changeset
|
204 mail_index_view_close(&view); |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
205 } |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
206 |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
207 static void status_flags_append(string_t *str, enum mail_flags flags, |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
208 const struct mbox_flag_type *flags_list) |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
209 { |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
210 int i; |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
211 |
3250
3b820e59610e
Recent flag handling cleanups. Added some comments.
Timo Sirainen <tss@iki.fi>
parents:
3245
diff
changeset
|
212 flags ^= MBOX_NONRECENT_KLUDGE; |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
213 for (i = 0; flags_list[i].chr != 0; i++) { |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
214 if ((flags & flags_list[i].flag) != 0) |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
215 str_append_c(str, flags_list[i].chr); |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
216 } |
3250
3b820e59610e
Recent flag handling cleanups. Added some comments.
Timo Sirainen <tss@iki.fi>
parents:
3245
diff
changeset
|
217 flags ^= MBOX_NONRECENT_KLUDGE; |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
218 } |
1209
539b7336b68a
mbox: strip some headers when saving message. also always set Content-Length
Timo Sirainen <tss@iki.fi>
parents:
1039
diff
changeset
|
219 |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
220 static void mbox_save_append_flag_headers(string_t *str, enum mail_flags flags) |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
221 { |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
222 if ((flags & STATUS_FLAGS_MASK) != 0) { |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
223 str_append(str, "Status: "); |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
224 status_flags_append(str, flags, mbox_status_flags); |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
225 str_append_c(str, '\n'); |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
226 } |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
227 |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
228 if ((flags & XSTATUS_FLAGS_MASK) != 0) { |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
229 str_append(str, "X-Status: "); |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
230 status_flags_append(str, flags, mbox_xstatus_flags); |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
231 str_append_c(str, '\n'); |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
232 } |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
233 } |
1209
539b7336b68a
mbox: strip some headers when saving message. also always set Content-Length
Timo Sirainen <tss@iki.fi>
parents:
1039
diff
changeset
|
234 |
3016
61c8d205d887
Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents:
2986
diff
changeset
|
235 static void |
61c8d205d887
Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents:
2986
diff
changeset
|
236 mbox_save_append_keyword_headers(struct mbox_save_context *ctx, |
3086 | 237 struct mail_keywords *keywords) |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
238 { |
2273
c48822c8713f
Updated comment about how syncing is done, and s/extra space/padding/
Timo Sirainen <tss@iki.fi>
parents:
2261
diff
changeset
|
239 unsigned char space[MBOX_HEADER_PADDING+1 + |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
240 sizeof("Content-Length: \n")-1 + MAX_INT_STRLEN]; |
4451
1a35d53c18fc
Array API redesigned to work using unions. It now provides type safety
Timo Sirainen <tss@iki.fi>
parents:
4412
diff
changeset
|
241 const ARRAY_TYPE(keywords) *keyword_names_list; |
3254
a2943c050571
Keywords are now stored in X-Keywords headers in mbox. Did several related
Timo Sirainen <tss@iki.fi>
parents:
3250
diff
changeset
|
242 const char *const *keyword_names; |
3262
f1134d265a9d
Don't crash while saving message if keywords aren't given..
Timo Sirainen <tss@iki.fi>
parents:
3260
diff
changeset
|
243 unsigned int i, count, keyword_names_count; |
3254
a2943c050571
Keywords are now stored in X-Keywords headers in mbox. Did several related
Timo Sirainen <tss@iki.fi>
parents:
3250
diff
changeset
|
244 |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
245 keyword_names_list = mail_index_get_keywords(ctx->mbox->ibox.index); |
3254
a2943c050571
Keywords are now stored in X-Keywords headers in mbox. Did several related
Timo Sirainen <tss@iki.fi>
parents:
3250
diff
changeset
|
246 keyword_names = array_get(keyword_names_list, &keyword_names_count); |
1209
539b7336b68a
mbox: strip some headers when saving message. also always set Content-Length
Timo Sirainen <tss@iki.fi>
parents:
1039
diff
changeset
|
247 |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
248 str_append(ctx->headers, "X-Keywords:"); |
3262
f1134d265a9d
Don't crash while saving message if keywords aren't given..
Timo Sirainen <tss@iki.fi>
parents:
3260
diff
changeset
|
249 count = keywords == NULL ? 0 : keywords->count; |
f1134d265a9d
Don't crash while saving message if keywords aren't given..
Timo Sirainen <tss@iki.fi>
parents:
3260
diff
changeset
|
250 for (i = 0; i < count; i++) { |
3254
a2943c050571
Keywords are now stored in X-Keywords headers in mbox. Did several related
Timo Sirainen <tss@iki.fi>
parents:
3250
diff
changeset
|
251 i_assert(keywords->idx[i] < keyword_names_count); |
a2943c050571
Keywords are now stored in X-Keywords headers in mbox. Did several related
Timo Sirainen <tss@iki.fi>
parents:
3250
diff
changeset
|
252 |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
253 str_append_c(ctx->headers, ' '); |
3254
a2943c050571
Keywords are now stored in X-Keywords headers in mbox. Did several related
Timo Sirainen <tss@iki.fi>
parents:
3250
diff
changeset
|
254 str_append(ctx->headers, keyword_names[keywords->idx[i]]); |
a2943c050571
Keywords are now stored in X-Keywords headers in mbox. Did several related
Timo Sirainen <tss@iki.fi>
parents:
3250
diff
changeset
|
255 } |
1209
539b7336b68a
mbox: strip some headers when saving message. also always set Content-Length
Timo Sirainen <tss@iki.fi>
parents:
1039
diff
changeset
|
256 |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
257 memset(space, ' ', sizeof(space)); |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
258 str_append_n(ctx->headers, space, sizeof(space)); |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
259 ctx->space_end_idx = str_len(ctx->headers); |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
260 str_append_c(ctx->headers, '\n'); |
22
a946ce1f09b7
mbox fixes, not fully working yet but almost :)
Timo Sirainen <tss@iki.fi>
parents:
13
diff
changeset
|
261 } |
0 | 262 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
263 static int |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
264 mbox_save_init_file(struct mbox_save_context *ctx, |
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3662
diff
changeset
|
265 struct mbox_transaction_context *t, bool want_mail) |
0 | 266 { |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
267 struct mbox_mailbox *mbox = ctx->mbox; |
5613 | 268 struct mail_storage *storage = &mbox->storage->storage; |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
269 int ret; |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
270 |
4193
a47df521d4fa
If mailbox was opened with readonly-flag, don't really force it. Fixes
Timo Sirainen <tss@iki.fi>
parents:
4070
diff
changeset
|
271 if (ctx->mbox->mbox_readonly) { |
5613 | 272 mail_storage_set_error(storage, MAIL_ERROR_PERM, |
3245
6491dab63e54
Added input stream parameter to mailbox_open(). With mbox it now allows
Timo Sirainen <tss@iki.fi>
parents:
3221
diff
changeset
|
273 "Read-only mbox"); |
6491dab63e54
Added input stream parameter to mailbox_open(). With mbox it now allows
Timo Sirainen <tss@iki.fi>
parents:
3221
diff
changeset
|
274 return -1; |
6491dab63e54
Added input stream parameter to mailbox_open(). With mbox it now allows
Timo Sirainen <tss@iki.fi>
parents:
3221
diff
changeset
|
275 } |
6491dab63e54
Added input stream parameter to mailbox_open(). With mbox it now allows
Timo Sirainen <tss@iki.fi>
parents:
3221
diff
changeset
|
276 |
5572
896845fbc4ed
Added mailbox_transaction_commit_get_uids() which returns the UID range for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
277 if ((t->ictx.flags & MAILBOX_TRANSACTION_FLAG_ASSIGN_UIDS) != 0) |
896845fbc4ed
Added mailbox_transaction_commit_get_uids() which returns the UID range for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
278 want_mail = TRUE; |
896845fbc4ed
Added mailbox_transaction_commit_get_uids() which returns the UID range for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
279 |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
280 if (ctx->append_offset == (uoff_t)-1) { |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
281 /* first appended mail in this transaction */ |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
282 if (mbox->mbox_lock_type != F_WRLCK) { |
3662
247501e81026
Instead of crashing when trying to copy mails within same mailbox, give an
Timo Sirainen <tss@iki.fi>
parents:
3565
diff
changeset
|
283 if (mbox->mbox_lock_type == F_RDLCK) { |
247501e81026
Instead of crashing when trying to copy mails within same mailbox, give an
Timo Sirainen <tss@iki.fi>
parents:
3565
diff
changeset
|
284 /* FIXME: we shouldn't fail here. it's just |
247501e81026
Instead of crashing when trying to copy mails within same mailbox, give an
Timo Sirainen <tss@iki.fi>
parents:
3565
diff
changeset
|
285 a locking issue that should be possible to |
247501e81026
Instead of crashing when trying to copy mails within same mailbox, give an
Timo Sirainen <tss@iki.fi>
parents:
3565
diff
changeset
|
286 fix.. */ |
5613 | 287 mail_storage_set_error(storage, |
288 MAIL_ERROR_NOTPOSSIBLE, | |
3662
247501e81026
Instead of crashing when trying to copy mails within same mailbox, give an
Timo Sirainen <tss@iki.fi>
parents:
3565
diff
changeset
|
289 "Can't copy mails inside same mailbox"); |
247501e81026
Instead of crashing when trying to copy mails within same mailbox, give an
Timo Sirainen <tss@iki.fi>
parents:
3565
diff
changeset
|
290 return -1; |
247501e81026
Instead of crashing when trying to copy mails within same mailbox, give an
Timo Sirainen <tss@iki.fi>
parents:
3565
diff
changeset
|
291 } |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
292 if (mbox_lock(mbox, F_WRLCK, &t->mbox_lock_id) <= 0) |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
293 return -1; |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
294 } |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
295 |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
296 if (mbox->mbox_fd == -1) { |
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
297 if (mbox_file_open(mbox) < 0) |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
298 return -1; |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
299 } |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
300 |
5240
117c9fd0b633
Keep track of the mbox dirty state better. Also when moving mails inside
Timo Sirainen <tss@iki.fi>
parents:
5168
diff
changeset
|
301 /* update mbox_sync_dirty state */ |
117c9fd0b633
Keep track of the mbox dirty state better. Also when moving mails inside
Timo Sirainen <tss@iki.fi>
parents:
5168
diff
changeset
|
302 ret = mbox_sync_has_changed(mbox, TRUE); |
117c9fd0b633
Keep track of the mbox dirty state better. Also when moving mails inside
Timo Sirainen <tss@iki.fi>
parents:
5168
diff
changeset
|
303 if (ret < 0) |
117c9fd0b633
Keep track of the mbox dirty state better. Also when moving mails inside
Timo Sirainen <tss@iki.fi>
parents:
5168
diff
changeset
|
304 return -1; |
117c9fd0b633
Keep track of the mbox dirty state better. Also when moving mails inside
Timo Sirainen <tss@iki.fi>
parents:
5168
diff
changeset
|
305 if (!want_mail && ret == 0) { |
117c9fd0b633
Keep track of the mbox dirty state better. Also when moving mails inside
Timo Sirainen <tss@iki.fi>
parents:
5168
diff
changeset
|
306 /* we're not required to assign UIDs for the appended |
117c9fd0b633
Keep track of the mbox dirty state better. Also when moving mails inside
Timo Sirainen <tss@iki.fi>
parents:
5168
diff
changeset
|
307 mails immediately. do it only if it doesn't require |
117c9fd0b633
Keep track of the mbox dirty state better. Also when moving mails inside
Timo Sirainen <tss@iki.fi>
parents:
5168
diff
changeset
|
308 syncing. */ |
117c9fd0b633
Keep track of the mbox dirty state better. Also when moving mails inside
Timo Sirainen <tss@iki.fi>
parents:
5168
diff
changeset
|
309 mbox_save_init_sync(t); |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
310 } |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
311 } |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
312 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
313 if (!ctx->synced && want_mail) { |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
314 /* we'll need to assign UID for the mail immediately. */ |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
315 if (mbox_sync(mbox, 0) < 0) |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
316 return -1; |
2892
62d53b49110d
Changed mail_index_get_header() to return the header as return value because
Timo Sirainen <tss@iki.fi>
parents:
2877
diff
changeset
|
317 mbox_save_init_sync(t); |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
318 } |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
319 |
5581
ee2f0f1cd700
If we synced the mbox while saving the message (happens only with quota
Timo Sirainen <tss@iki.fi>
parents:
5580
diff
changeset
|
320 /* the syncing above could have changed the append offset */ |
ee2f0f1cd700
If we synced the mbox while saving the message (happens only with quota
Timo Sirainen <tss@iki.fi>
parents:
5580
diff
changeset
|
321 if (ctx->append_offset == (uoff_t)-1) { |
ee2f0f1cd700
If we synced the mbox while saving the message (happens only with quota
Timo Sirainen <tss@iki.fi>
parents:
5580
diff
changeset
|
322 if (mbox_seek_to_end(ctx, &ctx->append_offset) < 0) |
ee2f0f1cd700
If we synced the mbox while saving the message (happens only with quota
Timo Sirainen <tss@iki.fi>
parents:
5580
diff
changeset
|
323 return -1; |
ee2f0f1cd700
If we synced the mbox while saving the message (happens only with quota
Timo Sirainen <tss@iki.fi>
parents:
5580
diff
changeset
|
324 |
6161
c62f7ee79446
Split o_stream_create_file() to _create_fd() and _create_fd_file().
Timo Sirainen <tss@iki.fi>
parents:
6142
diff
changeset
|
325 ctx->output = o_stream_create_fd_file(mbox->mbox_fd, |
c62f7ee79446
Split o_stream_create_file() to _create_fd() and _create_fd_file().
Timo Sirainen <tss@iki.fi>
parents:
6142
diff
changeset
|
326 ctx->append_offset, |
c62f7ee79446
Split o_stream_create_file() to _create_fd() and _create_fd_file().
Timo Sirainen <tss@iki.fi>
parents:
6142
diff
changeset
|
327 FALSE); |
5581
ee2f0f1cd700
If we synced the mbox while saving the message (happens only with quota
Timo Sirainen <tss@iki.fi>
parents:
5580
diff
changeset
|
328 } |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
329 return 0; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
330 } |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
331 |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
332 static void save_header_callback(struct message_header_line *hdr, |
4907
5b4c9b20eba0
Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents:
4681
diff
changeset
|
333 bool *matched, struct mbox_save_context *ctx) |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
334 { |
4681
cc110cb8c56b
Filter out "From " lines from headers. There's no reason they should exist
Timo Sirainen <tss@iki.fi>
parents:
4562
diff
changeset
|
335 if (hdr != NULL) { |
cc110cb8c56b
Filter out "From " lines from headers. There's no reason they should exist
Timo Sirainen <tss@iki.fi>
parents:
4562
diff
changeset
|
336 if (strncmp(hdr->name, "From ", 5) == 0) { |
cc110cb8c56b
Filter out "From " lines from headers. There's no reason they should exist
Timo Sirainen <tss@iki.fi>
parents:
4562
diff
changeset
|
337 /* we can't allow From_-lines in headers. there's no |
cc110cb8c56b
Filter out "From " lines from headers. There's no reason they should exist
Timo Sirainen <tss@iki.fi>
parents:
4562
diff
changeset
|
338 legitimate reason for allowing them in any case, |
cc110cb8c56b
Filter out "From " lines from headers. There's no reason they should exist
Timo Sirainen <tss@iki.fi>
parents:
4562
diff
changeset
|
339 so just drop them. */ |
cc110cb8c56b
Filter out "From " lines from headers. There's no reason they should exist
Timo Sirainen <tss@iki.fi>
parents:
4562
diff
changeset
|
340 *matched = TRUE; |
cc110cb8c56b
Filter out "From " lines from headers. There's no reason they should exist
Timo Sirainen <tss@iki.fi>
parents:
4562
diff
changeset
|
341 return; |
cc110cb8c56b
Filter out "From " lines from headers. There's no reason they should exist
Timo Sirainen <tss@iki.fi>
parents:
4562
diff
changeset
|
342 } |
cc110cb8c56b
Filter out "From " lines from headers. There's no reason they should exist
Timo Sirainen <tss@iki.fi>
parents:
4562
diff
changeset
|
343 |
cc110cb8c56b
Filter out "From " lines from headers. There's no reason they should exist
Timo Sirainen <tss@iki.fi>
parents:
4562
diff
changeset
|
344 if (!*matched && ctx->mbox_md5_ctx != NULL) |
cc110cb8c56b
Filter out "From " lines from headers. There's no reason they should exist
Timo Sirainen <tss@iki.fi>
parents:
4562
diff
changeset
|
345 mbox_md5_continue(ctx->mbox_md5_ctx, hdr); |
cc110cb8c56b
Filter out "From " lines from headers. There's no reason they should exist
Timo Sirainen <tss@iki.fi>
parents:
4562
diff
changeset
|
346 } |
2973
32cc9186d8eb
If we want MD5 sums in indexes, mail saving should also add them.
Timo Sirainen <tss@iki.fi>
parents:
2892
diff
changeset
|
347 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
348 if ((hdr == NULL && ctx->eoh_input_offset == (uoff_t)-1) || |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
349 (hdr != NULL && hdr->eoh)) |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
350 ctx->eoh_input_offset = ctx->input->v_offset; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
351 } |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
352 |
5167
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
353 static void mbox_save_x_delivery_id(struct mbox_save_context *ctx) |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
354 { |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
355 unsigned char md5_result[MD5_RESULTLEN]; |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
356 buffer_t *buf; |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
357 void *randbuf; |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
358 |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
359 t_push(); |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
360 buf = buffer_create_dynamic(pool_datastack_create(), 256); |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
361 buffer_append(buf, &ioloop_time, sizeof(ioloop_time)); |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
362 buffer_append(buf, &ioloop_timeval.tv_usec, |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
363 sizeof(ioloop_timeval.tv_usec)); |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
364 |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
365 randbuf = buffer_append_space_unsafe(buf, MBOX_DELIVERY_ID_RAND_BYTES); |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
366 random_fill_weak(randbuf, MBOX_DELIVERY_ID_RAND_BYTES); |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
367 |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
368 md5_get_digest(buf->data, buf->used, md5_result); |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
369 |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
370 str_append(ctx->headers, "X-Delivery-ID: "); |
5580
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
371 ctx->x_delivery_id_pos = str_len(ctx->headers); |
5167
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
372 base64_encode(md5_result, sizeof(md5_result), ctx->headers); |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
373 str_append_c(ctx->headers, '\n'); |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
374 t_pop(); |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
375 } |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
376 |
4044
da1d65e064f8
mailbox_save_init() supports now returning failure. Quota plugin now checks
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3879
diff
changeset
|
377 int mbox_save_init(struct mailbox_transaction_context *_t, |
da1d65e064f8
mailbox_save_init() supports now returning failure. Quota plugin now checks
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3879
diff
changeset
|
378 enum mail_flags flags, struct mail_keywords *keywords, |
da1d65e064f8
mailbox_save_init() supports now returning failure. Quota plugin now checks
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3879
diff
changeset
|
379 time_t received_date, int timezone_offset __attr_unused__, |
da1d65e064f8
mailbox_save_init() supports now returning failure. Quota plugin now checks
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3879
diff
changeset
|
380 const char *from_envelope, struct istream *input, |
4268
7112aad504ae
Changed mailbox_save_*() API a bit: Moved the struct mail *dest_mail to
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4193
diff
changeset
|
381 struct mail *dest_mail, struct mail_save_context **ctx_r) |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
382 { |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
383 struct mbox_transaction_context *t = |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
384 (struct mbox_transaction_context *)_t; |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
385 struct mbox_mailbox *mbox = (struct mbox_mailbox *)t->ictx.ibox; |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
386 struct mbox_save_context *ctx = t->save_ctx; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
387 enum mail_flags save_flags; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
388 uint64_t offset; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
389 |
3209
923ff19873d4
Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents:
3086
diff
changeset
|
390 i_assert((t->ictx.flags & MAILBOX_TRANSACTION_FLAG_EXTERNAL) != 0); |
923ff19873d4
Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents:
3086
diff
changeset
|
391 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
392 /* FIXME: we could write timezone_offset to From-line.. */ |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
393 if (received_date == (time_t)-1) |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
394 received_date = ioloop_time; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
395 |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
396 if (ctx == NULL) { |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
397 ctx = t->save_ctx = i_new(struct mbox_save_context, 1); |
3209
923ff19873d4
Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents:
3086
diff
changeset
|
398 ctx->ctx.transaction = &t->ictx.mailbox_ctx; |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
399 ctx->mbox = mbox; |
3209
923ff19873d4
Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents:
3086
diff
changeset
|
400 ctx->trans = t->ictx.trans; |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
401 ctx->append_offset = (uoff_t)-1; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
402 ctx->headers = str_new(default_pool, 512); |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
403 ctx->mail_offset = (uoff_t)-1; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
404 } |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
405 |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
406 ctx->failed = FALSE; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
407 ctx->seq = 0; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
408 |
4268
7112aad504ae
Changed mailbox_save_*() API a bit: Moved the struct mail *dest_mail to
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4193
diff
changeset
|
409 if (mbox_save_init_file(ctx, t, dest_mail != NULL) < 0) { |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
410 ctx->failed = TRUE; |
4044
da1d65e064f8
mailbox_save_init() supports now returning failure. Quota plugin now checks
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3879
diff
changeset
|
411 return -1; |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
412 } |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
413 |
3016
61c8d205d887
Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents:
2986
diff
changeset
|
414 save_flags = (flags & ~MAIL_RECENT) | MAIL_RECENT; |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
415 str_truncate(ctx->headers, 0); |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
416 if (ctx->synced) { |
5580
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
417 if (ctx->mbox->mbox_save_md5) |
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
418 ctx->mbox_md5_ctx = mbox_md5_init(); |
5124
e008f09dc3c9
When saving a message to an empty mbox file, write X-IMAPbase header so the
Timo Sirainen <tss@iki.fi>
parents:
4918
diff
changeset
|
419 if (ctx->output->offset == 0) { |
e008f09dc3c9
When saving a message to an empty mbox file, write X-IMAPbase header so the
Timo Sirainen <tss@iki.fi>
parents:
4918
diff
changeset
|
420 /* writing the first mail. Insert X-IMAPbase as well. */ |
e008f09dc3c9
When saving a message to an empty mbox file, write X-IMAPbase header so the
Timo Sirainen <tss@iki.fi>
parents:
4918
diff
changeset
|
421 str_printfa(ctx->headers, "X-IMAPbase: %u %010u\n", |
e008f09dc3c9
When saving a message to an empty mbox file, write X-IMAPbase header so the
Timo Sirainen <tss@iki.fi>
parents:
4918
diff
changeset
|
422 ctx->uid_validity, ctx->next_uid); |
e008f09dc3c9
When saving a message to an empty mbox file, write X-IMAPbase header so the
Timo Sirainen <tss@iki.fi>
parents:
4918
diff
changeset
|
423 } |
5459
78eaf595359c
Removed struct index_storage abstraction. It's pointless.
Timo Sirainen <tss@iki.fi>
parents:
5281
diff
changeset
|
424 if ((mbox->storage->storage.flags & |
5167
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
425 MAIL_STORAGE_FLAG_KEEP_HEADER_MD5) != 0) { |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
426 /* we're using MD5 sums to generate POP3 UIDLs. |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
427 clients don't like it much if there are duplicates, |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
428 so make sure that there can't be any by appending |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
429 our own X-Delivery-ID header. */ |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
430 mbox_save_x_delivery_id(ctx); |
b11b55f8912a
If pop3_uidl_format=%m, add a unique X-Delivery-ID header to all saved
Timo Sirainen <tss@iki.fi>
parents:
5124
diff
changeset
|
431 } |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
432 str_printfa(ctx->headers, "X-UID: %u\n", ctx->next_uid); |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
433 if (!mbox->ibox.keep_recent) |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
434 save_flags &= ~MAIL_RECENT; |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
435 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
436 mail_index_append(ctx->trans, ctx->next_uid, &ctx->seq); |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
437 mail_index_update_flags(ctx->trans, ctx->seq, MODIFY_REPLACE, |
3016
61c8d205d887
Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents:
2986
diff
changeset
|
438 save_flags); |
3471
138e242c53c9
Keywords weren't saved to index while saving.
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
439 if (keywords != NULL) { |
138e242c53c9
Keywords weren't saved to index while saving.
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
440 mail_index_update_keywords(ctx->trans, ctx->seq, |
138e242c53c9
Keywords weren't saved to index while saving.
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
441 MODIFY_REPLACE, keywords); |
138e242c53c9
Keywords weren't saved to index while saving.
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
442 } |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
443 |
2261
ba4f6d7b5a58
saving messages to empty mbox was buggy
Timo Sirainen <tss@iki.fi>
parents:
2224
diff
changeset
|
444 offset = ctx->output->offset == 0 ? 0 : |
ba4f6d7b5a58
saving messages to empty mbox was buggy
Timo Sirainen <tss@iki.fi>
parents:
2224
diff
changeset
|
445 ctx->output->offset - 1; |
2671
3b70ddb51771
Renamed "extra record info" and variations of it to "extension" or "ext" in
Timo Sirainen <tss@iki.fi>
parents:
2511
diff
changeset
|
446 mail_index_update_ext(ctx->trans, ctx->seq, |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
447 mbox->mbox_ext_idx, &offset, NULL); |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
448 ctx->next_uid++; |
3464
0661239a7034
Cache mail headers when saving mails to mbox. We should cache everything,
Timo Sirainen <tss@iki.fi>
parents:
3348
diff
changeset
|
449 |
3471
138e242c53c9
Keywords weren't saved to index while saving.
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
450 /* parse and cache the mail headers as we read it */ |
4268
7112aad504ae
Changed mailbox_save_*() API a bit: Moved the struct mail *dest_mail to
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4193
diff
changeset
|
451 if (dest_mail == NULL) { |
7112aad504ae
Changed mailbox_save_*() API a bit: Moved the struct mail *dest_mail to
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4193
diff
changeset
|
452 if (ctx->mail == NULL) |
6302
a8d5d826318b
Call mail_alloc/mail_free, not index_mail_alloc/index_mail/free directly.
Timo Sirainen <tss@iki.fi>
parents:
6277
diff
changeset
|
453 ctx->mail = mail_alloc(_t, 0, NULL); |
4268
7112aad504ae
Changed mailbox_save_*() API a bit: Moved the struct mail *dest_mail to
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4193
diff
changeset
|
454 dest_mail = ctx->mail; |
7112aad504ae
Changed mailbox_save_*() API a bit: Moved the struct mail *dest_mail to
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4193
diff
changeset
|
455 } |
6277
5f66277bbe40
mail_index_lookup*() can't fail anymore. Changed several APIs not to return
Timo Sirainen <tss@iki.fi>
parents:
6267
diff
changeset
|
456 mail_set_seq(dest_mail, ctx->seq); |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
457 } |
3250
3b820e59610e
Recent flag handling cleanups. Added some comments.
Timo Sirainen <tss@iki.fi>
parents:
3245
diff
changeset
|
458 mbox_save_append_flag_headers(ctx->headers, save_flags); |
3016
61c8d205d887
Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents:
2986
diff
changeset
|
459 mbox_save_append_keyword_headers(ctx, keywords); |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
460 str_append_c(ctx->headers, '\n'); |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
461 |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
462 i_assert(mbox->mbox_lock_type == F_WRLCK); |
0 | 463 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
464 ctx->mail_offset = ctx->output->offset; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
465 ctx->eoh_input_offset = (uoff_t)-1; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
466 ctx->eoh_offset = (uoff_t)-1; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
467 ctx->last_char = '\n'; |
6265
0ee2b0691f3e
Cache received date, sent date, save date and physical size when saving
Timo Sirainen <tss@iki.fi>
parents:
6161
diff
changeset
|
468 ctx->received_date = received_date; |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
469 |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
470 if (write_from_line(ctx, received_date, from_envelope) < 0) |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
471 ctx->failed = TRUE; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
472 else { |
5168
5dfa745c0622
Drop X-Delivery-ID header when saving the message.
Timo Sirainen <tss@iki.fi>
parents:
5167
diff
changeset
|
473 ctx->input = i_stream_create_header_filter(input, |
5dfa745c0622
Drop X-Delivery-ID header when saving the message.
Timo Sirainen <tss@iki.fi>
parents:
5167
diff
changeset
|
474 HEADER_FILTER_EXCLUDE | |
5dfa745c0622
Drop X-Delivery-ID header when saving the message.
Timo Sirainen <tss@iki.fi>
parents:
5167
diff
changeset
|
475 HEADER_FILTER_NO_CR, |
5dfa745c0622
Drop X-Delivery-ID header when saving the message.
Timo Sirainen <tss@iki.fi>
parents:
5167
diff
changeset
|
476 mbox_save_drop_headers, |
5dfa745c0622
Drop X-Delivery-ID header when saving the message.
Timo Sirainen <tss@iki.fi>
parents:
5167
diff
changeset
|
477 mbox_save_drop_headers_count, |
5dfa745c0622
Drop X-Delivery-ID header when saving the message.
Timo Sirainen <tss@iki.fi>
parents:
5167
diff
changeset
|
478 save_header_callback, ctx); |
3260
6a179bf1272e
Moved several getenv()s from lib-storage to main code. deliver binary was
Timo Sirainen <tss@iki.fi>
parents:
3254
diff
changeset
|
479 ctx->body_output = |
5459
78eaf595359c
Removed struct index_storage abstraction. It's pointless.
Timo Sirainen <tss@iki.fi>
parents:
5281
diff
changeset
|
480 (mbox->storage->storage.flags & |
3260
6a179bf1272e
Moved several getenv()s from lib-storage to main code. deliver binary was
Timo Sirainen <tss@iki.fi>
parents:
3254
diff
changeset
|
481 MAIL_STORAGE_FLAG_SAVE_CRLF) != 0 ? |
6142
6c0bfc35af03
Removed memory pool parameter from iostreams. Default pool was almost always
Timo Sirainen <tss@iki.fi>
parents:
6104
diff
changeset
|
482 o_stream_create_crlf(ctx->output) : |
6c0bfc35af03
Removed memory pool parameter from iostreams. Default pool was almost always
Timo Sirainen <tss@iki.fi>
parents:
6104
diff
changeset
|
483 o_stream_create_lf(ctx->output); |
6104
a019240a9df1
Cache everything interesting while saving a message.
Timo Sirainen <tss@iki.fi>
parents:
5741
diff
changeset
|
484 if (ctx->mail != NULL) { |
a019240a9df1
Cache everything interesting while saving a message.
Timo Sirainen <tss@iki.fi>
parents:
5741
diff
changeset
|
485 input = index_mail_cache_parse_init(ctx->mail, |
a019240a9df1
Cache everything interesting while saving a message.
Timo Sirainen <tss@iki.fi>
parents:
5741
diff
changeset
|
486 ctx->input); |
a019240a9df1
Cache everything interesting while saving a message.
Timo Sirainen <tss@iki.fi>
parents:
5741
diff
changeset
|
487 i_stream_unref(&ctx->input); |
a019240a9df1
Cache everything interesting while saving a message.
Timo Sirainen <tss@iki.fi>
parents:
5741
diff
changeset
|
488 ctx->input = input; |
a019240a9df1
Cache everything interesting while saving a message.
Timo Sirainen <tss@iki.fi>
parents:
5741
diff
changeset
|
489 } |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
490 } |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
491 |
4044
da1d65e064f8
mailbox_save_init() supports now returning failure. Quota plugin now checks
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3879
diff
changeset
|
492 *ctx_r = &ctx->ctx; |
da1d65e064f8
mailbox_save_init() supports now returning failure. Quota plugin now checks
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3879
diff
changeset
|
493 return ctx->failed ? -1 : 0; |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
494 } |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
495 |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
496 int mbox_save_continue(struct mail_save_context *_ctx) |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
497 { |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
498 struct mbox_save_context *ctx = (struct mbox_save_context *)_ctx; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
499 const unsigned char *data; |
2456 | 500 size_t size; |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
501 ssize_t ret; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
502 |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
503 if (ctx->failed) |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
504 return -1; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
505 |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
506 if (ctx->eoh_offset != (uoff_t)-1) { |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
507 /* writing body */ |
4412
521d07f9c247
If saved mail's body doesn't end with LF, add it ourself.
Timo Sirainen <tss@iki.fi>
parents:
4268
diff
changeset
|
508 while ((ret = i_stream_read(ctx->input)) != -1) { |
521d07f9c247
If saved mail's body doesn't end with LF, add it ourself.
Timo Sirainen <tss@iki.fi>
parents:
4268
diff
changeset
|
509 if (ret == 0) |
521d07f9c247
If saved mail's body doesn't end with LF, add it ourself.
Timo Sirainen <tss@iki.fi>
parents:
4268
diff
changeset
|
510 return 0; |
521d07f9c247
If saved mail's body doesn't end with LF, add it ourself.
Timo Sirainen <tss@iki.fi>
parents:
4268
diff
changeset
|
511 |
521d07f9c247
If saved mail's body doesn't end with LF, add it ourself.
Timo Sirainen <tss@iki.fi>
parents:
4268
diff
changeset
|
512 data = i_stream_get_data(ctx->input, &size); |
5281
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
513 if (o_stream_send(ctx->body_output, data, size) < 0) |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
514 return write_error(ctx); |
4412
521d07f9c247
If saved mail's body doesn't end with LF, add it ourself.
Timo Sirainen <tss@iki.fi>
parents:
4268
diff
changeset
|
515 ctx->last_char = data[size-1]; |
521d07f9c247
If saved mail's body doesn't end with LF, add it ourself.
Timo Sirainen <tss@iki.fi>
parents:
4268
diff
changeset
|
516 i_stream_skip(ctx->input, size); |
6104
a019240a9df1
Cache everything interesting while saving a message.
Timo Sirainen <tss@iki.fi>
parents:
5741
diff
changeset
|
517 |
a019240a9df1
Cache everything interesting while saving a message.
Timo Sirainen <tss@iki.fi>
parents:
5741
diff
changeset
|
518 if (ctx->mail != NULL) |
a019240a9df1
Cache everything interesting while saving a message.
Timo Sirainen <tss@iki.fi>
parents:
5741
diff
changeset
|
519 index_mail_cache_parse_continue(ctx->mail); |
4412
521d07f9c247
If saved mail's body doesn't end with LF, add it ourself.
Timo Sirainen <tss@iki.fi>
parents:
4268
diff
changeset
|
520 } |
521d07f9c247
If saved mail's body doesn't end with LF, add it ourself.
Timo Sirainen <tss@iki.fi>
parents:
4268
diff
changeset
|
521 |
521d07f9c247
If saved mail's body doesn't end with LF, add it ourself.
Timo Sirainen <tss@iki.fi>
parents:
4268
diff
changeset
|
522 if (ctx->last_char != '\n') { |
521d07f9c247
If saved mail's body doesn't end with LF, add it ourself.
Timo Sirainen <tss@iki.fi>
parents:
4268
diff
changeset
|
523 /* if mail doesn't end with LF, we'll do that. |
521d07f9c247
If saved mail's body doesn't end with LF, add it ourself.
Timo Sirainen <tss@iki.fi>
parents:
4268
diff
changeset
|
524 otherwise some mbox parsers don't like the result. |
521d07f9c247
If saved mail's body doesn't end with LF, add it ourself.
Timo Sirainen <tss@iki.fi>
parents:
4268
diff
changeset
|
525 this makes it impossible to save a mail that doesn't |
521d07f9c247
If saved mail's body doesn't end with LF, add it ourself.
Timo Sirainen <tss@iki.fi>
parents:
4268
diff
changeset
|
526 end with LF though. */ |
5281
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
527 if (o_stream_send(ctx->body_output, "\n", 1) < 0) |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
528 return write_error(ctx); |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
529 } |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
530 return 0; |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
531 } |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
532 |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
533 while ((ret = i_stream_read(ctx->input)) != -1) { |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
534 if (ret == 0) |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
535 return 0; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
536 |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
537 data = i_stream_get_data(ctx->input, &size); |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
538 if (ctx->eoh_input_offset != (uoff_t)-1 && |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
539 ctx->input->v_offset + size >= ctx->eoh_input_offset) { |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
540 /* found end of headers. write the rest of them. */ |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
541 size = ctx->eoh_input_offset - ctx->input->v_offset; |
5281
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
542 if (o_stream_send(ctx->output, data, size) < 0) |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
543 return write_error(ctx); |
2456 | 544 if (size > 0) |
545 ctx->last_char = data[size-1]; | |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
546 i_stream_skip(ctx->input, size + 1); |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
547 break; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
548 } |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
549 |
5281
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
550 if (o_stream_send(ctx->output, data, size) < 0) |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
551 return write_error(ctx); |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
552 ctx->last_char = data[size-1]; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
553 i_stream_skip(ctx->input, size); |
6104
a019240a9df1
Cache everything interesting while saving a message.
Timo Sirainen <tss@iki.fi>
parents:
5741
diff
changeset
|
554 |
a019240a9df1
Cache everything interesting while saving a message.
Timo Sirainen <tss@iki.fi>
parents:
5741
diff
changeset
|
555 if (ctx->mail != NULL) |
a019240a9df1
Cache everything interesting while saving a message.
Timo Sirainen <tss@iki.fi>
parents:
5741
diff
changeset
|
556 index_mail_cache_parse_continue(ctx->mail); |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
557 } |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
558 |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
559 if (ctx->last_char != '\n') { |
5281
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
560 if (o_stream_send(ctx->output, "\n", 1) < 0) |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
561 return write_error(ctx); |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
562 } |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
563 |
2978
982e7432276f
If mbox isn't synced, don't try to set message's md5sum because it just
Timo Sirainen <tss@iki.fi>
parents:
2973
diff
changeset
|
564 if (ctx->mbox_md5_ctx) { |
2973
32cc9186d8eb
If we want MD5 sums in indexes, mail saving should also add them.
Timo Sirainen <tss@iki.fi>
parents:
2892
diff
changeset
|
565 unsigned char hdr_md5_sum[16]; |
32cc9186d8eb
If we want MD5 sums in indexes, mail saving should also add them.
Timo Sirainen <tss@iki.fi>
parents:
2892
diff
changeset
|
566 |
5580
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
567 if (ctx->x_delivery_id_pos != 0) { |
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
568 struct message_header_line hdr; |
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
569 const unsigned char *p; |
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
570 |
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
571 memset(&hdr, 0, sizeof(hdr)); |
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
572 hdr.name = "X-Delivery-ID"; |
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
573 hdr.name_len = strlen(hdr.name); |
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
574 hdr.middle = (const unsigned char *)": "; |
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
575 hdr.middle_len = 2; |
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
576 hdr.value = hdr.full_value = str_data(ctx->headers) + |
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
577 ctx->x_delivery_id_pos; |
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
578 |
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
579 for (p = hdr.value; *p != '\n'; p++) ; |
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
580 hdr.value_len = hdr.full_value_len = p - hdr.value; |
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
581 mbox_md5_continue(ctx->mbox_md5_ctx, &hdr); |
071d9bc5a075
If pop3_uidl_format=%m, it wasn't cached correctly when saving new messages
Timo Sirainen <tss@iki.fi>
parents:
5573
diff
changeset
|
582 } |
2973
32cc9186d8eb
If we want MD5 sums in indexes, mail saving should also add them.
Timo Sirainen <tss@iki.fi>
parents:
2892
diff
changeset
|
583 mbox_md5_finish(ctx->mbox_md5_ctx, hdr_md5_sum); |
32cc9186d8eb
If we want MD5 sums in indexes, mail saving should also add them.
Timo Sirainen <tss@iki.fi>
parents:
2892
diff
changeset
|
584 mail_index_update_ext(ctx->trans, ctx->seq, |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
585 ctx->mbox->ibox.md5hdr_ext_idx, |
2973
32cc9186d8eb
If we want MD5 sums in indexes, mail saving should also add them.
Timo Sirainen <tss@iki.fi>
parents:
2892
diff
changeset
|
586 hdr_md5_sum, NULL); |
32cc9186d8eb
If we want MD5 sums in indexes, mail saving should also add them.
Timo Sirainen <tss@iki.fi>
parents:
2892
diff
changeset
|
587 } |
32cc9186d8eb
If we want MD5 sums in indexes, mail saving should also add them.
Timo Sirainen <tss@iki.fi>
parents:
2892
diff
changeset
|
588 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
589 /* append our own headers and ending empty line */ |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
590 ctx->extra_hdr_offset = ctx->output->offset; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
591 if (o_stream_send(ctx->output, str_data(ctx->headers), |
5281
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
592 str_len(ctx->headers)) < 0) |
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
593 return write_error(ctx); |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
594 ctx->eoh_offset = ctx->output->offset; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
595 |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
596 /* write body */ |
2461 | 597 (void)i_stream_get_data(ctx->input, &size); |
598 return ctx->input->eof && size == 0 ? 0 : mbox_save_continue(_ctx); | |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
599 } |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
600 |
4268
7112aad504ae
Changed mailbox_save_*() API a bit: Moved the struct mail *dest_mail to
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4193
diff
changeset
|
601 int mbox_save_finish(struct mail_save_context *_ctx) |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
602 { |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
603 struct mbox_save_context *ctx = (struct mbox_save_context *)_ctx; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
604 |
4044
da1d65e064f8
mailbox_save_init() supports now returning failure. Quota plugin now checks
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3879
diff
changeset
|
605 ctx->finished = TRUE; |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
606 if (!ctx->failed) { |
5281
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
607 t_push(); |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
608 if (mbox_write_content_length(ctx) < 0 || |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
609 mbox_append_lf(ctx) < 0) |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
610 ctx->failed = TRUE; |
5281
2712ba108fba
o_stream_seek() may do buffer flushing internally and cause errors. Do
Timo Sirainen <tss@iki.fi>
parents:
5240
diff
changeset
|
611 t_pop(); |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
612 } |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
613 |
6104
a019240a9df1
Cache everything interesting while saving a message.
Timo Sirainen <tss@iki.fi>
parents:
5741
diff
changeset
|
614 if (ctx->mail != NULL) |
6265
0ee2b0691f3e
Cache received date, sent date, save date and physical size when saving
Timo Sirainen <tss@iki.fi>
parents:
6161
diff
changeset
|
615 index_mail_cache_parse_deinit(ctx->mail, ctx->received_date); |
3879
928229f8b3e6
deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents:
3863
diff
changeset
|
616 if (ctx->input != NULL) |
4070
71b8faa84ec6
Added i_stream_destroy() and o_stream_destroy() and used them instead of
Timo Sirainen <tss@iki.fi>
parents:
4044
diff
changeset
|
617 i_stream_destroy(&ctx->input); |
3879
928229f8b3e6
deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents:
3863
diff
changeset
|
618 if (ctx->body_output != NULL) |
4070
71b8faa84ec6
Added i_stream_destroy() and o_stream_destroy() and used them instead of
Timo Sirainen <tss@iki.fi>
parents:
4044
diff
changeset
|
619 o_stream_destroy(&ctx->body_output); |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
620 |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
621 if (ctx->failed && ctx->mail_offset != (uoff_t)-1) { |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
622 /* saving this mail failed - truncate back to beginning of it */ |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
623 if (ftruncate(ctx->mbox->mbox_fd, (off_t)ctx->mail_offset) < 0) |
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
624 mbox_set_syscall_error(ctx->mbox, "ftruncate()"); |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
625 ctx->mail_offset = (uoff_t)-1; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
626 } |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
627 |
4268
7112aad504ae
Changed mailbox_save_*() API a bit: Moved the struct mail *dest_mail to
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4193
diff
changeset
|
628 return ctx->failed ? -1 : 0; |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
629 } |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
630 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
631 void mbox_save_cancel(struct mail_save_context *_ctx) |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
632 { |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
633 struct mbox_save_context *ctx = (struct mbox_save_context *)_ctx; |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
634 |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
635 ctx->failed = TRUE; |
4268
7112aad504ae
Changed mailbox_save_*() API a bit: Moved the struct mail *dest_mail to
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4193
diff
changeset
|
636 (void)mbox_save_finish(_ctx); |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
637 } |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
638 |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
639 static void mbox_transaction_save_deinit(struct mbox_save_context *ctx) |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
640 { |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
641 i_assert(ctx->body_output == NULL); |
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
642 |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
643 if (ctx->output != NULL) |
4070
71b8faa84ec6
Added i_stream_destroy() and o_stream_destroy() and used them instead of
Timo Sirainen <tss@iki.fi>
parents:
4044
diff
changeset
|
644 o_stream_destroy(&ctx->output); |
3464
0661239a7034
Cache mail headers when saving mails to mbox. We should cache everything,
Timo Sirainen <tss@iki.fi>
parents:
3348
diff
changeset
|
645 if (ctx->mail != NULL) |
6302
a8d5d826318b
Call mail_alloc/mail_free, not index_mail_alloc/index_mail/free directly.
Timo Sirainen <tss@iki.fi>
parents:
6277
diff
changeset
|
646 mail_free(&ctx->mail); |
3879
928229f8b3e6
deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents:
3863
diff
changeset
|
647 str_free(&ctx->headers); |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
648 i_free(ctx); |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
649 } |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
650 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
651 int mbox_transaction_save_commit(struct mbox_save_context *ctx) |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
652 { |
5572
896845fbc4ed
Added mailbox_transaction_commit_get_uids() which returns the UID range for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
653 struct mbox_transaction_context *t = |
896845fbc4ed
Added mailbox_transaction_commit_get_uids() which returns the UID range for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
654 (struct mbox_transaction_context *)ctx->ctx.transaction; |
4562
8b9933470cf8
After saving a mail with index being in synced state, update the sync_stamp
Timo Sirainen <tss@iki.fi>
parents:
4527
diff
changeset
|
655 struct stat st; |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
656 int ret = 0; |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
657 |
4044
da1d65e064f8
mailbox_save_init() supports now returning failure. Quota plugin now checks
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3879
diff
changeset
|
658 i_assert(ctx->finished); |
da1d65e064f8
mailbox_save_init() supports now returning failure. Quota plugin now checks
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3879
diff
changeset
|
659 |
5741
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
660 if (fstat(ctx->mbox->mbox_fd, &st) < 0) { |
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
661 mbox_set_syscall_error(ctx->mbox, "fstat()"); |
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
662 ret = -1; |
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
663 } |
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
664 |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
665 if (ctx->synced) { |
6267
3a1eed408cad
mailbox_transaction_commit_get_uids() now returns also UIDVALIDITY. It's the
Timo Sirainen <tss@iki.fi>
parents:
6265
diff
changeset
|
666 *t->ictx.saved_uid_validity = ctx->uid_validity; |
5592 | 667 *t->ictx.first_saved_uid = ctx->first_saved_uid; |
668 | |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
669 mail_index_update_header(ctx->trans, |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
670 offsetof(struct mail_index_header, next_uid), |
3322
49071cc19102
If UIDVALIDITY changes, don't invalidate the whole index. Just expunge all
Timo Sirainen <tss@iki.fi>
parents:
3280
diff
changeset
|
671 &ctx->next_uid, sizeof(ctx->next_uid), FALSE); |
4562
8b9933470cf8
After saving a mail with index being in synced state, update the sync_stamp
Timo Sirainen <tss@iki.fi>
parents:
4527
diff
changeset
|
672 |
5741
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
673 if (!ctx->mbox->mbox_sync_dirty && ret == 0) { |
4562
8b9933470cf8
After saving a mail with index being in synced state, update the sync_stamp
Timo Sirainen <tss@iki.fi>
parents:
4527
diff
changeset
|
674 uint32_t sync_stamp = st.st_mtime; |
8b9933470cf8
After saving a mail with index being in synced state, update the sync_stamp
Timo Sirainen <tss@iki.fi>
parents:
4527
diff
changeset
|
675 uint64_t sync_size = st.st_size; |
8b9933470cf8
After saving a mail with index being in synced state, update the sync_stamp
Timo Sirainen <tss@iki.fi>
parents:
4527
diff
changeset
|
676 |
8b9933470cf8
After saving a mail with index being in synced state, update the sync_stamp
Timo Sirainen <tss@iki.fi>
parents:
4527
diff
changeset
|
677 mail_index_update_header(ctx->trans, |
8b9933470cf8
After saving a mail with index being in synced state, update the sync_stamp
Timo Sirainen <tss@iki.fi>
parents:
4527
diff
changeset
|
678 offsetof(struct mail_index_header, sync_stamp), |
8b9933470cf8
After saving a mail with index being in synced state, update the sync_stamp
Timo Sirainen <tss@iki.fi>
parents:
4527
diff
changeset
|
679 &sync_stamp, sizeof(sync_stamp), TRUE); |
8b9933470cf8
After saving a mail with index being in synced state, update the sync_stamp
Timo Sirainen <tss@iki.fi>
parents:
4527
diff
changeset
|
680 mail_index_update_header(ctx->trans, |
8b9933470cf8
After saving a mail with index being in synced state, update the sync_stamp
Timo Sirainen <tss@iki.fi>
parents:
4527
diff
changeset
|
681 offsetof(struct mail_index_header, sync_size), |
8b9933470cf8
After saving a mail with index being in synced state, update the sync_stamp
Timo Sirainen <tss@iki.fi>
parents:
4527
diff
changeset
|
682 &sync_size, sizeof(sync_size), TRUE); |
8b9933470cf8
After saving a mail with index being in synced state, update the sync_stamp
Timo Sirainen <tss@iki.fi>
parents:
4527
diff
changeset
|
683 } |
5572
896845fbc4ed
Added mailbox_transaction_commit_get_uids() which returns the UID range for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
684 |
5573
9805becea644
Fixed mailbox_transaction_commit_get_uids() to actually work and not just
Timo Sirainen <tss@iki.fi>
parents:
5572
diff
changeset
|
685 *t->ictx.last_saved_uid = ctx->next_uid - 1; |
2190
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
686 } |
755ec9442a58
mailbox_save() and mailbox_copy() functions can now return the saved mail so
Timo Sirainen <tss@iki.fi>
parents:
2129
diff
changeset
|
687 |
5741
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
688 if (ret == 0 && ctx->orig_atime != st.st_atime) { |
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
689 /* try to set atime back to its original value */ |
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
690 struct utimbuf buf; |
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
691 |
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
692 buf.modtime = st.st_mtime; |
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
693 buf.actime = ctx->orig_atime; |
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
694 if (utime(ctx->mbox->path, &buf) < 0) |
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
695 mbox_set_syscall_error(ctx->mbox, "utime()"); |
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
696 } |
7a57631e2d6c
Preserve mbox files' atime when saving/syncing.
Timo Sirainen <tss@iki.fi>
parents:
5613
diff
changeset
|
697 |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
698 if (!ctx->synced && ctx->mbox->mbox_fd != -1 && |
4918
2f9173e103fd
Added fsync_disable setting. Also added missing fsync()ing to dbox when
Timo Sirainen <tss@iki.fi>
parents:
4907
diff
changeset
|
699 !ctx->mbox->mbox_writeonly && !ctx->mbox->ibox.fsync_disable) { |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
700 if (fdatasync(ctx->mbox->mbox_fd) < 0) { |
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
701 mbox_set_syscall_error(ctx->mbox, "fdatasync()"); |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
702 ret = -1; |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
703 } |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
704 } |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
705 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
706 mbox_transaction_save_deinit(ctx); |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
707 return ret; |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
708 } |
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
709 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
710 void mbox_transaction_save_rollback(struct mbox_save_context *ctx) |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
711 { |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
712 struct mbox_mailbox *mbox = ctx->mbox; |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
713 |
4044
da1d65e064f8
mailbox_save_init() supports now returning failure. Quota plugin now checks
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3879
diff
changeset
|
714 if (!ctx->finished) |
da1d65e064f8
mailbox_save_init() supports now returning failure. Quota plugin now checks
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3879
diff
changeset
|
715 mbox_save_cancel(&ctx->ctx); |
da1d65e064f8
mailbox_save_init() supports now returning failure. Quota plugin now checks
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3879
diff
changeset
|
716 |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
717 if (ctx->append_offset != (uoff_t)-1 && mbox->mbox_fd != -1) { |
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
718 i_assert(mbox->mbox_lock_type == F_WRLCK); |
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1958
diff
changeset
|
719 |
1015
40a327d356de
Support for MULTIAPPEND extension. COPY now behaves like spec says - if it
Timo Sirainen <tss@iki.fi>
parents:
988
diff
changeset
|
720 /* failed, truncate file back to original size. |
40a327d356de
Support for MULTIAPPEND extension. COPY now behaves like spec says - if it
Timo Sirainen <tss@iki.fi>
parents:
988
diff
changeset
|
721 output stream needs to be flushed before truncating |
40a327d356de
Support for MULTIAPPEND extension. COPY now behaves like spec says - if it
Timo Sirainen <tss@iki.fi>
parents:
988
diff
changeset
|
722 so unref() won't write anything. */ |
40a327d356de
Support for MULTIAPPEND extension. COPY now behaves like spec says - if it
Timo Sirainen <tss@iki.fi>
parents:
988
diff
changeset
|
723 o_stream_flush(ctx->output); |
562 | 724 |
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
725 if (ftruncate(mbox->mbox_fd, (off_t)ctx->append_offset) < 0) |
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3262
diff
changeset
|
726 mbox_set_syscall_error(mbox, "ftruncate()"); |
1015
40a327d356de
Support for MULTIAPPEND extension. COPY now behaves like spec says - if it
Timo Sirainen <tss@iki.fi>
parents:
988
diff
changeset
|
727 } |
40a327d356de
Support for MULTIAPPEND extension. COPY now behaves like spec says - if it
Timo Sirainen <tss@iki.fi>
parents:
988
diff
changeset
|
728 |
2446
47e1e05cede0
Changed mail saving API to be nonblocking.
Timo Sirainen <tss@iki.fi>
parents:
2421
diff
changeset
|
729 mbox_transaction_save_deinit(ctx); |
1015
40a327d356de
Support for MULTIAPPEND extension. COPY now behaves like spec says - if it
Timo Sirainen <tss@iki.fi>
parents:
988
diff
changeset
|
730 } |