]>
Commit | Line | Data |
---|---|---|
1 | diff -udprP mutt-1.5.19.orig/compress.c mutt-1.5.19/compress.c | |
2 | --- mutt-1.5.19.orig/compress.c 1970-01-01 03:00:00.000000000 +0300 | |
3 | +++ mutt-1.5.19/compress.c 2009-01-06 19:16:04.000000000 +0200 | |
4 | @@ -0,0 +1,490 @@ | |
5 | +/* | |
6 | + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com> | |
7 | + * | |
8 | + * This program is free software; you can redistribute it and/or modify | |
9 | + * it under the terms of the GNU General Public License as published by | |
10 | + * the Free Software Foundation; either version 2 of the License, or | |
11 | + * (at your option) any later version. | |
12 | + * | |
13 | + * This program is distributed in the hope that it will be useful, | |
14 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 | + * GNU General Public License for more details. | |
17 | + * | |
18 | + * You should have received a copy of the GNU General Public License | |
19 | + * along with this program; if not, write to the Free Software | |
20 | + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |
21 | + */ | |
22 | + | |
23 | +#if HAVE_CONFIG_H | |
24 | +# include "config.h" | |
25 | +#endif | |
26 | + | |
27 | +#include "mutt.h" | |
28 | + | |
29 | +#ifdef USE_COMPRESSED | |
30 | + | |
31 | +#include "mx.h" | |
32 | +#include "mailbox.h" | |
33 | +#include "mutt_curses.h" | |
34 | + | |
35 | +#include <errno.h> | |
36 | +#include <string.h> | |
37 | +#include <unistd.h> | |
38 | +#include <sys/stat.h> | |
39 | + | |
40 | +typedef struct | |
41 | +{ | |
42 | + const char *close; /* close-hook command */ | |
43 | + const char *open; /* open-hook command */ | |
44 | + const char *append; /* append-hook command */ | |
45 | + off_t size; /* size of real folder */ | |
46 | +} COMPRESS_INFO; | |
47 | + | |
48 | +char echo_cmd[HUGE_STRING]; | |
49 | + | |
50 | +/* parameters: | |
51 | + * ctx - context to lock | |
52 | + * excl - exclusive lock? | |
53 | + * retry - should retry if unable to lock? | |
54 | + */ | |
55 | +int mbox_lock_compressed (CONTEXT *ctx, FILE *fp, int excl, int retry) | |
56 | +{ | |
57 | + int r; | |
58 | + | |
59 | + if ((r = mx_lock_file (ctx->realpath, fileno (fp), excl, 1, retry)) == 0) | |
60 | + ctx->locked = 1; | |
61 | + else if (retry && !excl) | |
62 | + { | |
63 | + ctx->readonly = 1; | |
64 | + return 0; | |
65 | + } | |
66 | + | |
67 | + return (r); | |
68 | +} | |
69 | + | |
70 | +void mbox_unlock_compressed (CONTEXT *ctx, FILE *fp) | |
71 | +{ | |
72 | + if (ctx->locked) | |
73 | + { | |
74 | + fflush (fp); | |
75 | + | |
76 | + mx_unlock_file (ctx->realpath, fileno (fp), 1); | |
77 | + ctx->locked = 0; | |
78 | + } | |
79 | +} | |
80 | + | |
81 | +static int is_new (const char *path) | |
82 | +{ | |
83 | + return (access (path, W_OK) != 0 && errno == ENOENT) ? 1 : 0; | |
84 | +} | |
85 | + | |
86 | +static const char* find_compress_hook (int type, const char *path) | |
87 | +{ | |
88 | + const char* c = mutt_find_hook (type, path); | |
89 | + return (!c || !*c) ? NULL : c; | |
90 | +} | |
91 | + | |
92 | +int mutt_can_read_compressed (const char *path) | |
93 | +{ | |
94 | + return find_compress_hook (M_OPENHOOK, path) ? 1 : 0; | |
95 | +} | |
96 | + | |
97 | +/* if the file is new, we really do not append, but create, and so use | |
98 | + * close-hook, and not append-hook | |
99 | + */ | |
100 | +static const char* get_append_command (const char *path, const CONTEXT* ctx) | |
101 | +{ | |
102 | + COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; | |
103 | + return (is_new (path)) ? ci->close : ci->append; | |
104 | +} | |
105 | + | |
106 | +int mutt_can_append_compressed (const char *path) | |
107 | +{ | |
108 | + int magic; | |
109 | + | |
110 | + if (is_new (path)) | |
111 | + return (find_compress_hook (M_CLOSEHOOK, path) ? 1 : 0); | |
112 | + | |
113 | + magic = mx_get_magic (path); | |
114 | + | |
115 | + if (magic != 0 && magic != M_COMPRESSED) | |
116 | + return 0; | |
117 | + | |
118 | + return (find_compress_hook (M_APPENDHOOK, path) | |
119 | + || (find_compress_hook (M_OPENHOOK, path) | |
120 | + && find_compress_hook (M_CLOSEHOOK, path))) ? 1 : 0; | |
121 | +} | |
122 | + | |
123 | +/* open a compressed mailbox */ | |
124 | +static COMPRESS_INFO *set_compress_info (CONTEXT *ctx) | |
125 | +{ | |
126 | + COMPRESS_INFO *ci; | |
127 | + | |
128 | + /* Now lets uncompress this thing */ | |
129 | + ci = safe_malloc (sizeof (COMPRESS_INFO)); | |
130 | + ctx->compressinfo = (void*) ci; | |
131 | + ci->append = find_compress_hook (M_APPENDHOOK, ctx->path); | |
132 | + ci->open = find_compress_hook (M_OPENHOOK, ctx->path); | |
133 | + ci->close = find_compress_hook (M_CLOSEHOOK, ctx->path); | |
134 | + return ci; | |
135 | +} | |
136 | + | |
137 | +static void set_path (CONTEXT* ctx) | |
138 | +{ | |
139 | + char tmppath[_POSIX_PATH_MAX]; | |
140 | + | |
141 | + /* Setup the right paths */ | |
142 | + ctx->realpath = ctx->path; | |
143 | + | |
144 | + /* Uncompress to /tmp */ | |
145 | + mutt_mktemp (tmppath); | |
146 | + ctx->path = safe_malloc (strlen (tmppath) + 1); | |
147 | + strcpy (ctx->path, tmppath); | |
148 | +} | |
149 | + | |
150 | +static int get_size (const char* path) | |
151 | +{ | |
152 | + struct stat sb; | |
153 | + if (stat (path, &sb) != 0) | |
154 | + return 0; | |
155 | + return (sb.st_size); | |
156 | +} | |
157 | + | |
158 | +static void store_size (CONTEXT* ctx) | |
159 | +{ | |
160 | + COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; | |
161 | + ci->size = get_size (ctx->realpath); | |
162 | +} | |
163 | + | |
164 | +static const char * | |
165 | +compresshook_format_str (char *dest, size_t destlen, size_t col, char op, | |
166 | + const char *src, const char *fmt, const char *ifstring, | |
167 | + const char *elsestring, unsigned long data, | |
168 | + format_flag flags) | |
169 | +{ | |
170 | + char tmp[SHORT_STRING]; | |
171 | + | |
172 | + CONTEXT *ctx = (CONTEXT *) data; | |
173 | + switch (op) | |
174 | + { | |
175 | + case 'f': | |
176 | + snprintf (tmp, sizeof (tmp), "%%%ss", fmt); | |
177 | + snprintf (dest, destlen, tmp, ctx->realpath); | |
178 | + break; | |
179 | + case 't': | |
180 | + snprintf (tmp, sizeof (tmp), "%%%ss", fmt); | |
181 | + snprintf (dest, destlen, tmp, ctx->path); | |
182 | + break; | |
183 | + } | |
184 | + return (src); | |
185 | +} | |
186 | + | |
187 | +/* check that the command has both %f and %t | |
188 | + * 0 means OK, -1 means error | |
189 | + */ | |
190 | +int mutt_test_compress_command (const char* cmd) | |
191 | +{ | |
192 | + return (strstr (cmd, "%f") && strstr (cmd, "%t")) ? 0 : -1; | |
193 | +} | |
194 | + | |
195 | +static char *get_compression_cmd (const char* cmd, const CONTEXT* ctx) | |
196 | +{ | |
197 | + char expanded[_POSIX_PATH_MAX]; | |
198 | + mutt_FormatString (expanded, sizeof (expanded), 0, cmd, compresshook_format_str, | |
199 | + (unsigned long) ctx, 0); | |
200 | + return safe_strdup (expanded); | |
201 | +} | |
202 | + | |
203 | +int mutt_check_mailbox_compressed (CONTEXT* ctx) | |
204 | +{ | |
205 | + COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; | |
206 | + if (ci->size != get_size (ctx->realpath)) | |
207 | + { | |
208 | + FREE (&ctx->compressinfo); | |
209 | + FREE (&ctx->realpath); | |
210 | + mutt_error _("Mailbox was corrupted!"); | |
211 | + return (-1); | |
212 | + } | |
213 | + return (0); | |
214 | +} | |
215 | + | |
216 | +int mutt_open_read_compressed (CONTEXT *ctx) | |
217 | +{ | |
218 | + char *cmd; | |
219 | + FILE *fp; | |
220 | + int rc; | |
221 | + | |
222 | + COMPRESS_INFO *ci = set_compress_info (ctx); | |
223 | + if (!ci->open) { | |
224 | + ctx->magic = 0; | |
225 | + FREE (ctx->compressinfo); | |
226 | + return (-1); | |
227 | + } | |
228 | + if (!ci->close || access (ctx->path, W_OK) != 0) | |
229 | + ctx->readonly = 1; | |
230 | + | |
231 | + set_path (ctx); | |
232 | + store_size (ctx); | |
233 | + | |
234 | + if (!ctx->quiet) | |
235 | + mutt_message (_("Decompressing %s..."), ctx->realpath); | |
236 | + | |
237 | + cmd = get_compression_cmd (ci->open, ctx); | |
238 | + if (cmd == NULL) | |
239 | + return (-1); | |
240 | + dprint (2, (debugfile, "DecompressCmd: '%s'\n", cmd)); | |
241 | + | |
242 | + if ((fp = fopen (ctx->realpath, "r")) == NULL) | |
243 | + { | |
244 | + mutt_perror (ctx->realpath); | |
245 | + FREE (&cmd); | |
246 | + return (-1); | |
247 | + } | |
248 | + mutt_block_signals (); | |
249 | + if (mbox_lock_compressed (ctx, fp, 0, 1) == -1) | |
250 | + { | |
251 | + fclose (fp); | |
252 | + mutt_unblock_signals (); | |
253 | + mutt_error _("Unable to lock mailbox!"); | |
254 | + FREE (&cmd); | |
255 | + return (-1); | |
256 | + } | |
257 | + | |
258 | + endwin (); | |
259 | + fflush (stdout); | |
260 | + sprintf(echo_cmd,_("echo Decompressing %s..."),ctx->realpath); | |
261 | + mutt_system(echo_cmd); | |
262 | + rc = mutt_system (cmd); | |
263 | + mbox_unlock_compressed (ctx, fp); | |
264 | + mutt_unblock_signals (); | |
265 | + fclose (fp); | |
266 | + | |
267 | + if (rc) | |
268 | + { | |
269 | + mutt_any_key_to_continue (NULL); | |
270 | + ctx->magic = 0; | |
271 | + FREE (ctx->compressinfo); | |
272 | + mutt_error (_("Error executing: %s : unable to open the mailbox!\n"), cmd); | |
273 | + } | |
274 | + FREE (&cmd); | |
275 | + if (rc) | |
276 | + return (-1); | |
277 | + | |
278 | + if (mutt_check_mailbox_compressed (ctx)) | |
279 | + return (-1); | |
280 | + | |
281 | + ctx->magic = mx_get_magic (ctx->path); | |
282 | + | |
283 | + return (0); | |
284 | +} | |
285 | + | |
286 | +void restore_path (CONTEXT* ctx) | |
287 | +{ | |
288 | + FREE (&ctx->path); | |
289 | + ctx->path = ctx->realpath; | |
290 | +} | |
291 | + | |
292 | +/* remove the temporary mailbox */ | |
293 | +void remove_file (CONTEXT* ctx) | |
294 | +{ | |
295 | + if (ctx->magic == M_MBOX || ctx->magic == M_MMDF) | |
296 | + remove (ctx->path); | |
297 | +} | |
298 | + | |
299 | +int mutt_open_append_compressed (CONTEXT *ctx) | |
300 | +{ | |
301 | + FILE *fh; | |
302 | + COMPRESS_INFO *ci = set_compress_info (ctx); | |
303 | + | |
304 | + if (!get_append_command (ctx->path, ctx)) | |
305 | + { | |
306 | + if (ci->open && ci->close) | |
307 | + return (mutt_open_read_compressed (ctx)); | |
308 | + | |
309 | + ctx->magic = 0; | |
310 | + FREE (&ctx->compressinfo); | |
311 | + return (-1); | |
312 | + } | |
313 | + | |
314 | + set_path (ctx); | |
315 | + | |
316 | + ctx->magic = DefaultMagic; | |
317 | + | |
318 | + if (!is_new (ctx->realpath)) | |
319 | + if (ctx->magic == M_MBOX || ctx->magic == M_MMDF) | |
320 | + if ((fh = fopen (ctx->path, "w"))) | |
321 | + fclose (fh); | |
322 | + /* No error checking - the parent function will catch it */ | |
323 | + | |
324 | + return (0); | |
325 | +} | |
326 | + | |
327 | +/* close a compressed mailbox */ | |
328 | +void mutt_fast_close_compressed (CONTEXT *ctx) | |
329 | +{ | |
330 | + dprint (2, (debugfile, "mutt_fast_close_compressed called on '%s'\n", | |
331 | + ctx->path)); | |
332 | + | |
333 | + if (ctx->compressinfo) | |
334 | + { | |
335 | + if (ctx->fp) | |
336 | + fclose (ctx->fp); | |
337 | + ctx->fp = NULL; | |
338 | + /* if the folder was removed, remove the gzipped folder too */ | |
339 | + if (access (ctx->path, F_OK) != 0 && ! option (OPTSAVEEMPTY)) | |
340 | + remove (ctx->realpath); | |
341 | + else | |
342 | + remove_file (ctx); | |
343 | + | |
344 | + restore_path (ctx); | |
345 | + FREE (&ctx->compressinfo); | |
346 | + } | |
347 | +} | |
348 | + | |
349 | +/* return 0 on success, -1 on failure */ | |
350 | +int mutt_sync_compressed (CONTEXT* ctx) | |
351 | +{ | |
352 | + char *cmd; | |
353 | + int rc = 0; | |
354 | + FILE *fp; | |
355 | + COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; | |
356 | + | |
357 | + if (!ctx->quiet) | |
358 | + mutt_message (_("Compressing %s..."), ctx->realpath); | |
359 | + | |
360 | + cmd = get_compression_cmd (ci->close, ctx); | |
361 | + if (cmd == NULL) | |
362 | + return (-1); | |
363 | + | |
364 | + if ((fp = fopen (ctx->realpath, "a")) == NULL) | |
365 | + { | |
366 | + mutt_perror (ctx->realpath); | |
367 | + FREE (&cmd); | |
368 | + return (-1); | |
369 | + } | |
370 | + mutt_block_signals (); | |
371 | + if (mbox_lock_compressed (ctx, fp, 1, 1) == -1) | |
372 | + { | |
373 | + fclose (fp); | |
374 | + mutt_unblock_signals (); | |
375 | + mutt_error _("Unable to lock mailbox!"); | |
376 | + | |
377 | + store_size (ctx); | |
378 | + | |
379 | + FREE (&cmd); | |
380 | + return (-1); | |
381 | + } | |
382 | + | |
383 | + dprint (2, (debugfile, "CompressCommand: '%s'\n", cmd)); | |
384 | + | |
385 | + endwin (); | |
386 | + fflush (stdout); | |
387 | + sprintf(echo_cmd,_("echo Compressing %s..."), ctx->realpath); | |
388 | + mutt_system(echo_cmd); | |
389 | + if (mutt_system (cmd)) | |
390 | + { | |
391 | + mutt_any_key_to_continue (NULL); | |
392 | + mutt_error (_("%s: Error compressing mailbox! Original mailbox deleted, uncompressed one kept!\n"), ctx->path); | |
393 | + rc = -1; | |
394 | + } | |
395 | + | |
396 | + mbox_unlock_compressed (ctx, fp); | |
397 | + mutt_unblock_signals (); | |
398 | + fclose (fp); | |
399 | + | |
400 | + FREE (&cmd); | |
401 | + | |
402 | + store_size (ctx); | |
403 | + | |
404 | + return (rc); | |
405 | +} | |
406 | + | |
407 | +int mutt_slow_close_compressed (CONTEXT *ctx) | |
408 | +{ | |
409 | + FILE *fp; | |
410 | + const char *append; | |
411 | + char *cmd; | |
412 | + COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; | |
413 | + | |
414 | + dprint (2, (debugfile, "mutt_slow_close_compressed called on '%s'\n", | |
415 | + ctx->path)); | |
416 | + | |
417 | + if (! (ctx->append | |
418 | + && ((append = get_append_command (ctx->realpath, ctx)) | |
419 | + || (append = ci->close)))) | |
420 | + { /* if we can not or should not append, | |
421 | + * we only have to remove the compressed info, because sync was already | |
422 | + * called | |
423 | + */ | |
424 | + mutt_fast_close_compressed (ctx); | |
425 | + return (0); | |
426 | + } | |
427 | + | |
428 | + if (ctx->fp) | |
429 | + fclose (ctx->fp); | |
430 | + ctx->fp = NULL; | |
431 | + | |
432 | + if (!ctx->quiet) | |
433 | + { | |
434 | + if (append == ci->close) | |
435 | + mutt_message (_("Compressing %s..."), ctx->realpath); | |
436 | + else | |
437 | + mutt_message (_("Compressed-appending to %s..."), ctx->realpath); | |
438 | + } | |
439 | + | |
440 | + cmd = get_compression_cmd (append, ctx); | |
441 | + if (cmd == NULL) | |
442 | + return (-1); | |
443 | + | |
444 | + if ((fp = fopen (ctx->realpath, "a")) == NULL) | |
445 | + { | |
446 | + mutt_perror (ctx->realpath); | |
447 | + FREE (&cmd); | |
448 | + return (-1); | |
449 | + } | |
450 | + mutt_block_signals (); | |
451 | + if (mbox_lock_compressed (ctx, fp, 1, 1) == -1) | |
452 | + { | |
453 | + fclose (fp); | |
454 | + mutt_unblock_signals (); | |
455 | + mutt_error _("Unable to lock mailbox!"); | |
456 | + FREE (&cmd); | |
457 | + return (-1); | |
458 | + } | |
459 | + | |
460 | + dprint (2, (debugfile, "CompressCmd: '%s'\n", cmd)); | |
461 | + | |
462 | + endwin (); | |
463 | + fflush (stdout); | |
464 | + | |
465 | + if (append == ci->close) | |
466 | + sprintf(echo_cmd,_("echo Compressing %s..."), ctx->realpath); | |
467 | + else | |
468 | + sprintf(echo_cmd,_("echo Compressed-appending to %s..."), ctx->realpath); | |
469 | + mutt_system(echo_cmd); | |
470 | + | |
471 | + if (mutt_system (cmd)) | |
472 | + { | |
473 | + mutt_any_key_to_continue (NULL); | |
474 | + mutt_error (_(" %s: Error compressing mailbox! Uncompressed one kept!\n"), | |
475 | + ctx->path); | |
476 | + FREE (&cmd); | |
477 | + mbox_unlock_compressed (ctx, fp); | |
478 | + mutt_unblock_signals (); | |
479 | + fclose (fp); | |
480 | + return (-1); | |
481 | + } | |
482 | + | |
483 | + mbox_unlock_compressed (ctx, fp); | |
484 | + mutt_unblock_signals (); | |
485 | + fclose (fp); | |
486 | + remove_file (ctx); | |
487 | + restore_path (ctx); | |
488 | + FREE (&cmd); | |
489 | + FREE (&ctx->compressinfo); | |
490 | + | |
491 | + return (0); | |
492 | +} | |
493 | + | |
494 | +#endif /* USE_COMPRESSED */ | |
495 | diff -udprP mutt-1.5.19.orig/compress.h mutt-1.5.19/compress.h | |
496 | --- mutt-1.5.19.orig/compress.h 1970-01-01 03:00:00.000000000 +0300 | |
497 | +++ mutt-1.5.19/compress.h 2009-01-06 19:16:04.000000000 +0200 | |
498 | @@ -0,0 +1,27 @@ | |
499 | +/* | |
500 | + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com> | |
501 | + * | |
502 | + * This program is free software; you can redistribute it and/or modify | |
503 | + * it under the terms of the GNU General Public License as published by | |
504 | + * the Free Software Foundation; either version 2 of the License, or | |
505 | + * (at your option) any later version. | |
506 | + * | |
507 | + * This program is distributed in the hope that it will be useful, | |
508 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
509 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
510 | + * GNU General Public License for more details. | |
511 | + * | |
512 | + * You should have received a copy of the GNU General Public License | |
513 | + * along with this program; if not, write to the Free Software | |
514 | + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |
515 | + */ | |
516 | + | |
517 | +int mutt_can_read_compressed (const char *); | |
518 | +int mutt_can_append_compressed (const char *); | |
519 | +int mutt_open_read_compressed (CONTEXT *); | |
520 | +int mutt_open_append_compressed (CONTEXT *); | |
521 | +int mutt_slow_close_compressed (CONTEXT *); | |
522 | +int mutt_sync_compressed (CONTEXT *); | |
523 | +int mutt_test_compress_command (const char *); | |
524 | +int mutt_check_mailbox_compressed (CONTEXT *); | |
525 | +void mutt_fast_close_compressed (CONTEXT *); | |
526 | diff -udprP mutt-1.5.19.orig/config.h.in mutt-1.5.19/config.h.in | |
527 | --- mutt-1.5.19.orig/config.h.in 2008-11-18 01:54:00.000000000 +0200 | |
528 | +++ mutt-1.5.19/config.h.in 2009-01-06 19:16:04.000000000 +0200 | |
529 | @@ -521,6 +521,9 @@ | |
530 | ||
531 | /* Define to enable Sun mailtool attachments support. */ | |
532 | #undef SUN_ATTACHMENT | |
533 | + | |
534 | +/* The compressed mailboxes support */ | |
535 | +#undef USE_COMPRESSED | |
536 | ||
537 | /* Define to use dotlocking for mailboxes. */ | |
538 | #undef USE_DOTLOCK | |
539 | diff -udprP mutt-1.5.19.orig/configure mutt-1.5.19/configure | |
540 | --- mutt-1.5.19.orig/configure 2008-11-18 01:53:41.000000000 +0200 | |
541 | +++ mutt-1.5.19/configure 2009-01-06 19:16:04.000000000 +0200 | |
542 | @@ -1366,6 +1366,7 @@ Optional Features: | |
543 | --disable-warnings Turn off compiler warnings (not recommended) | |
544 | --enable-nfs-fix Work around an NFS with broken attributes caching | |
545 | --enable-mailtool Enable Sun mailtool attachments support | |
546 | + --enable-compressed Enable compressed folders support | |
547 | --enable-locales-fix The result of isprint() is unreliable | |
548 | --enable-exact-address Enable regeneration of email addresses | |
549 | --enable-hcache Enable header caching | |
550 | @@ -12978,6 +12979,18 @@ echo "${ECHO_T}$mutt_cv_regex_broken" >& | |
551 | fi | |
552 | fi | |
553 | ||
554 | + | |
555 | +# Check whether --enable-compressed or --disable-compressed was given. | |
556 | +if test "${enable_compressed+set}" = set; then | |
557 | + enableval="$enable_compressed" | |
558 | + if test x$enableval = xyes; then | |
559 | + cat >> confdefs.h <<\EOF | |
560 | +#define USE_COMPRESSED 1 | |
561 | +EOF | |
562 | + | |
563 | + fi | |
564 | +fi | |
565 | + | |
566 | if test $mutt_cv_regex = yes; then | |
567 | ||
568 | cat >>confdefs.h <<\_ACEOF | |
569 | diff -udprP mutt-1.5.19.orig/configure.ac mutt-1.5.19/configure.ac | |
570 | --- mutt-1.5.19.orig/configure.ac 2008-11-17 22:15:26.000000000 +0200 | |
571 | +++ mutt-1.5.19/configure.ac 2009-01-06 19:16:04.000000000 +0200 | |
572 | @@ -789,6 +789,11 @@ AC_ARG_ENABLE(mailtool, AC_HELP_STRING([ | |
573 | AC_DEFINE(SUN_ATTACHMENT,1,[ Define to enable Sun mailtool attachments support. ]) | |
574 | fi]) | |
575 | ||
576 | +AC_ARG_ENABLE(compressed, AC_HELP_STRING([--enable-compressed], [Enable compressed folders support]), | |
577 | + [if test x$enableval = xyes; then | |
578 | + AC_DEFINE(USE_COMPRESSED,1,[ Define to enable compressed folders support. ]) | |
579 | + fi]) | |
580 | + | |
581 | AC_ARG_ENABLE(locales-fix, AC_HELP_STRING([--enable-locales-fix], [The result of isprint() is unreliable]), | |
582 | [if test x$enableval = xyes; then | |
583 | AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) | |
584 | diff -udprP mutt-1.5.19.orig/curs_main.c mutt-1.5.19/curs_main.c | |
585 | --- mutt-1.5.19.orig/curs_main.c 2009-01-05 21:20:53.000000000 +0200 | |
586 | +++ mutt-1.5.19/curs_main.c 2009-01-06 19:16:04.000000000 +0200 | |
587 | @@ -1108,6 +1108,11 @@ int mutt_index_menu (void) | |
588 | { | |
589 | int check; | |
590 | ||
591 | +#ifdef USE_COMPRESSED | |
592 | + if (Context->compressinfo && Context->realpath) | |
593 | + mutt_str_replace (&LastFolder, Context->realpath); | |
594 | + else | |
595 | +#endif | |
596 | mutt_str_replace (&LastFolder, Context->path); | |
597 | oldcount = Context ? Context->msgcount : 0; | |
598 | ||
599 | diff -udprP mutt-1.5.19.orig/doc/Makefile.am mutt-1.5.19/doc/Makefile.am | |
600 | --- mutt-1.5.19.orig/doc/Makefile.am 2009-01-05 21:20:53.000000000 +0200 | |
601 | +++ mutt-1.5.19/doc/Makefile.am 2009-01-06 19:16:04.000000000 +0200 | |
602 | @@ -31,7 +31,8 @@ EXTRA_DIST = dotlock.man \ | |
603 | ||
604 | HTML_DOCFILES = manual.html index.html intro.html gettingstarted.html \ | |
605 | configuration.html mimesupport.html advancedusage.html \ | |
606 | - optionalfeatures.html tuning.html reference.html miscellany.html | |
607 | + optionalfeatures.html tuning.html reference.html miscellany.html \ | |
608 | + compressed-folders.html | |
609 | ||
610 | BUILT_DISTFILES = stamp-doc-xml stamp-doc-chunked manual.txt $(HTML_DOCFILES) | |
611 | ||
612 | diff -udprP mutt-1.5.19.orig/doc/Makefile.in mutt-1.5.19/doc/Makefile.in | |
613 | --- mutt-1.5.19.orig/doc/Makefile.in 2009-01-05 21:24:14.000000000 +0200 | |
614 | +++ mutt-1.5.19/doc/Makefile.in 2009-01-06 19:16:04.000000000 +0200 | |
615 | @@ -234,7 +234,8 @@ EXTRA_DIST = dotlock.man \ | |
616 | ||
617 | HTML_DOCFILES = manual.html index.html intro.html gettingstarted.html \ | |
618 | configuration.html mimesupport.html advancedusage.html \ | |
619 | - optionalfeatures.html tuning.html reference.html miscellany.html | |
620 | + optionalfeatures.html tuning.html reference.html miscellany.html \ | |
621 | + compressed-folders.html | |
622 | ||
623 | BUILT_DISTFILES = stamp-doc-xml stamp-doc-chunked manual.txt $(HTML_DOCFILES) | |
624 | srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt \ | |
625 | diff -udprP mutt-1.5.19.orig/doc/manual.xml.head mutt-1.5.19/doc/manual.xml.head | |
626 | --- mutt-1.5.19.orig/doc/manual.xml.head 2009-01-05 21:20:53.000000000 +0200 | |
627 | +++ mutt-1.5.19/doc/manual.xml.head 2009-01-06 19:35:41.000000000 +0200 | |
628 | @@ -4639,6 +4639,24 @@ configuration option/command. See | |
629 | <link linkend="fcc-save-hook">fcc-save-hook</link> | |
630 | </para> | |
631 | </listitem> | |
632 | +<listitem> | |
633 | + | |
634 | +<para> | |
635 | +<link linkend="open-hook">open-hook</link> | |
636 | +</para> | |
637 | +</listitem> | |
638 | +<listitem> | |
639 | + | |
640 | +<para> | |
641 | +<link linkend="close-hook">close-hook</link> | |
642 | +</para> | |
643 | +</listitem> | |
644 | +<listitem> | |
645 | + | |
646 | +<para> | |
647 | +<link linkend="append-hook">append-hook</link> | |
648 | +</para> | |
649 | +</listitem> | |
650 | ||
651 | </itemizedlist> | |
652 | ||
653 | @@ -5138,6 +5156,254 @@ macro pager \cb |urlview\n | |
654 | ||
655 | </chapter> | |
656 | ||
657 | +<chapter id="compressed-folders"> | |
658 | +<title>Compressed folders Support (OPTIONAL)</title> | |
659 | + | |
660 | +<para> | |
661 | +If Mutt was compiled with compressed folders support (by running the | |
662 | +<emphasis>configure</emphasis> script with the | |
663 | +<emphasis>--enable-compressed</emphasis> flag), Mutt can open folders | |
664 | +stored in an arbitrary format, provided that the user has a script to | |
665 | +convert from/to this format to one of the accepted. | |
666 | +</para> | |
667 | + | |
668 | +<para> | |
669 | +The most common use is to open compressed archived folders e.g. with | |
670 | +gzip. | |
671 | +</para> | |
672 | + | |
673 | +<para> | |
674 | +In addition, the user can provide a script that gets a folder in an | |
675 | +accepted format and appends its context to the folder in the | |
676 | +user-defined format, which may be faster than converting the entire | |
677 | +folder to the accepted format, appending to it and converting back to | |
678 | +the user-defined format. | |
679 | +</para> | |
680 | + | |
681 | +<para> | |
682 | +There are three hooks defined | |
683 | +(<link linkend="open-hook">open-hook</link>, | |
684 | +<link linkend="close-hook">close-hook</link> and | |
685 | +<link linkend="append-hook">append-hook</link>) which define commands | |
686 | +to uncompress and compress a folder and to append messages to an | |
687 | +existing compressed folder respectively. | |
688 | +</para> | |
689 | + | |
690 | +<para> | |
691 | +For example: | |
692 | + | |
693 | +<screen> | |
694 | +open-hook \\.gz$ "gzip -cd %f > %t" | |
695 | +close-hook \\.gz$ "gzip -c %t > %f" | |
696 | +append-hook \\.gz$ "gzip -c %t >> %f" | |
697 | +</screen> | |
698 | +</para> | |
699 | + | |
700 | +<para> | |
701 | +You do not have to specify all of the commands. If you omit | |
702 | +<link linkend="append-hook">append-hook</link>, the folder will be open | |
703 | +and closed again each time you will add to it. If you omit | |
704 | +<link linkend="close-hook">close-hook</link> (or give empty command), | |
705 | +the folder will be open in the mode. If you specify | |
706 | +<link linkend="append-hook">append-hook</link> though you'll be able to | |
707 | +append to the folder. | |
708 | +</para> | |
709 | + | |
710 | +<para> | |
711 | +Note that Mutt will only try to use hooks if the file is not in one of | |
712 | +the accepted formats. In particular, if the file is empty, mutt | |
713 | +supposes it is not compressed. This is important because it allows the | |
714 | +use of programs that do not have well defined extensions. Just use | |
715 | +``.'' as a regexp. But this may be surprising if your compressing | |
716 | +script produces empty files. In this situation, unset | |
717 | +<link linkend="save-empty">$save_empty</link>, so that | |
718 | +the compressed file will be removed if you delete all of the messages. | |
719 | +</para> | |
720 | + | |
721 | +<sect1 id="open-hook"> | |
722 | +<title>Open a compressed mailbox for reading</title> | |
723 | + | |
724 | +<para> | |
725 | +Usage: <literal>open-hook</literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis> | |
726 | +</para> | |
727 | + | |
728 | +<para> | |
729 | +The <emphasis>command</emphasis> is the command that can be used for | |
730 | +opening the folders whose names match <emphasis>regexp</emphasis>. | |
731 | +</para> | |
732 | + | |
733 | +<para> | |
734 | +The <emphasis>command</emphasis> string is the printf-like format | |
735 | +string, and it should accept two parameters: %f, which is | |
736 | +replaced with the (compressed) folder name, and %t which is | |
737 | +replaced with the name of the temporary folder to which to write. | |
738 | +</para> | |
739 | + | |
740 | +<para> | |
741 | +%f and %t can be repeated any number of times in the | |
742 | +command string, and all of the entries are replaced with the | |
743 | +appropriate folder name. In addition, %% is replaced by | |
744 | +%, as in printf, and any other %anything is left as is. | |
745 | +</para> | |
746 | + | |
747 | +<para> | |
748 | +The <emphasis>command</emphasis> should <emphasis role="bold">not</emphasis> | |
749 | +remove the original compressed file. The <emphasis>command</emphasis> | |
750 | +should return non-zero exit status if it fails, so mutt knows | |
751 | +something's wrong. | |
752 | +</para> | |
753 | + | |
754 | +<para> | |
755 | +Example: | |
756 | + | |
757 | +<screen> | |
758 | +open-hook \\.gz$ "gzip -cd %f > %t" | |
759 | +</screen> | |
760 | +</para> | |
761 | + | |
762 | +<para> | |
763 | +If the <emphasis>command</emphasis> is empty, this operation is | |
764 | +disabled for this file type. | |
765 | +</para> | |
766 | + | |
767 | +</sect1> | |
768 | + | |
769 | +<sect1 id="close-hook"> | |
770 | +<title>Write a compressed mailbox</title> | |
771 | + | |
772 | +<para> | |
773 | +Usage: <literal>close-hook</literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis> | |
774 | +</para> | |
775 | + | |
776 | +<para> | |
777 | +This is used to close the folder that was open with the | |
778 | +<link linkend="open-hook">open-hook</link> command after some changes | |
779 | +were made to it. | |
780 | +</para> | |
781 | + | |
782 | +<para> | |
783 | +The <emphasis>command</emphasis> string is the command that can be | |
784 | +used for closing the folders whose names match <emphasis>regexp</emphasis>. | |
785 | +It has the same format as in the <link linkend="open-hook">open-hook</link> | |
786 | +command. Temporary folder in this case is the folder previously | |
787 | +produced by the <link linkend="open-hook">open-hook</link> command. | |
788 | +</para> | |
789 | + | |
790 | +<para> | |
791 | +The <emphasis>command</emphasis> should <emphasis role="bold">not</emphasis> | |
792 | +remove the decompressed file. The <emphasis>command</emphasis> should | |
793 | +return non-zero exit status if it fails, so mutt knows something's | |
794 | +wrong. | |
795 | +</para> | |
796 | + | |
797 | +<para> | |
798 | +Example: | |
799 | + | |
800 | +<screen> | |
801 | +close-hook \\.gz$ "gzip -c %t > %f" | |
802 | +</screen> | |
803 | +</para> | |
804 | + | |
805 | +<para> | |
806 | +If the <emphasis>command</emphasis> is empty, this operation is | |
807 | +disabled for this file type, and the file can only be open in the | |
808 | +readonly mode. | |
809 | +</para> | |
810 | + | |
811 | +<para> | |
812 | +<link linkend="close-hook">close-hook</link> is not called when you | |
813 | +exit from the folder if the folder was not changed. | |
814 | +</para> | |
815 | + | |
816 | +</sect1> | |
817 | + | |
818 | +<sect1 id="append-hook"> | |
819 | +<title>Append a message to a compressed mailbox</title> | |
820 | + | |
821 | +<para> | |
822 | +Usage: <literal>append-hook</literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis> | |
823 | +</para> | |
824 | + | |
825 | +<para> | |
826 | +This command is used for saving to an existing compressed folder. | |
827 | +The <emphasis>command</emphasis> is the command that can be used for | |
828 | +appending to the folders whose names match <emphasis>regexp</emphasis>. | |
829 | +It has the same format as in the <link linkend="open-hook">open-hook</link> | |
830 | +command. The temporary folder in this case contains the messages that | |
831 | +are being appended. | |
832 | +</para> | |
833 | + | |
834 | +<para> | |
835 | +The <emphasis>command</emphasis> should <emphasis role="bold">not</emphasis> | |
836 | +remove the decompressed file. The <emphasis>command</emphasis> should | |
837 | +return non-zero exit status if it fails, so mutt knows something's | |
838 | +wrong. | |
839 | +</para> | |
840 | + | |
841 | +<para> | |
842 | +Example: | |
843 | + | |
844 | +<screen> | |
845 | +append-hook \\.gz$ "gzip -c %t >> %f" | |
846 | +</screen> | |
847 | +</para> | |
848 | + | |
849 | +<para> | |
850 | +When <link linkend="append-hook">append-hook</link> is used, the folder | |
851 | +is not opened, which saves time, but this means that we can not find | |
852 | +out what the folder type is. Thus the default | |
853 | +(<link linkend="mbox-type">$mbox_type</link>) type is | |
854 | +always supposed (i.e. this is the format used for the temporary | |
855 | +folder). | |
856 | +</para> | |
857 | + | |
858 | +<para> | |
859 | +If the file does not exist when you save to it, | |
860 | +<link linkend="close-hook">close-hook</link> is called, and not | |
861 | +<link linkend="append-hook">append-hook</link>. | |
862 | +<link linkend="append-hook">append-hook</link> is only for appending | |
863 | +to existing folders. | |
864 | +</para> | |
865 | + | |
866 | +<para> | |
867 | +If the <emphasis>command</emphasis> is empty, this operation is | |
868 | +disabled for this file type. In this case, the folder will be open and | |
869 | +closed again (using <link linkend="open-hook">open-hook</link> and | |
870 | +<link linkend="close-hook">close-hook</link> respectively) each time | |
871 | +you will add to it. | |
872 | +</para> | |
873 | + | |
874 | +</sect1> | |
875 | + | |
876 | +<sect1> | |
877 | +<title>Encrypted folders</title> | |
878 | + | |
879 | +<para> | |
880 | +The compressed folders support can also be used to handle encrypted | |
881 | +folders. If you want to encrypt a folder with PGP, you may want to use | |
882 | +the following hooks: | |
883 | + | |
884 | +<screen> | |
885 | +open-hook \\.pgp$ "pgp -f < %f > %t" | |
886 | +close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId < %t > %f" | |
887 | +</screen> | |
888 | +</para> | |
889 | + | |
890 | +<para> | |
891 | +Please note, that PGP does not support appending to an encrypted | |
892 | +folder, so there is no append-hook defined. | |
893 | +</para> | |
894 | + | |
895 | +<para> | |
896 | +<emphasis role="bold">Note:</emphasis> the folder is temporary stored | |
897 | +decrypted in the /tmp directory, where it can be read by your system | |
898 | +administrator. So think about the security aspects of this. | |
899 | +</para> | |
900 | + | |
901 | +</sect1> | |
902 | + | |
903 | +</chapter> | |
904 | + | |
905 | <chapter id="mimesupport"> | |
906 | <title>Mutt's MIME Support</title> | |
907 | ||
908 | @@ -6942,6 +7208,18 @@ The following are the commands understoo | |
909 | ||
910 | <listitem> | |
911 | <cmdsynopsis> | |
912 | +<command><link linkend="append-hook">append-hook</link></command> | |
913 | +<arg choice="plain"> | |
914 | +<replaceable class="parameter">pattern</replaceable> | |
915 | +</arg> | |
916 | +<arg choice="plain"> | |
917 | +<replaceable class="parameter">command</replaceable> | |
918 | +</arg> | |
919 | +</cmdsynopsis> | |
920 | +</listitem> | |
921 | + | |
922 | +<listitem> | |
923 | +<cmdsynopsis> | |
924 | <command><link linkend="auto-view">auto-view</link></command> | |
925 | <arg choice="plain"> | |
926 | <replaceable>mimetype</replaceable> | |
927 | @@ -7007,6 +7285,18 @@ The following are the commands understoo | |
928 | ||
929 | <listitem> | |
930 | <cmdsynopsis> | |
931 | +<command><link linkend="close-hook">close-hook</link></command> | |
932 | +<arg choice="plain"> | |
933 | +<replaceable class="parameter">pattern</replaceable> | |
934 | +</arg> | |
935 | +<arg choice="plain"> | |
936 | +<replaceable class="parameter">command</replaceable> | |
937 | +</arg> | |
938 | +</cmdsynopsis> | |
939 | +</listitem> | |
940 | + | |
941 | +<listitem> | |
942 | +<cmdsynopsis> | |
943 | <command><link linkend="color">color</link></command> | |
944 | <arg choice="plain"> | |
945 | <replaceable class="parameter">object</replaceable> | |
946 | @@ -7421,6 +7711,18 @@ The following are the commands understoo | |
947 | ||
948 | <listitem> | |
949 | <cmdsynopsis> | |
950 | +<command><link linkend="open-hook">open-hook</link></command> | |
951 | +<arg choice="plain"> | |
952 | +<replaceable class="parameter">pattern</replaceable> | |
953 | +</arg> | |
954 | +<arg choice="plain"> | |
955 | +<replaceable class="parameter">command</replaceable> | |
956 | +</arg> | |
957 | +</cmdsynopsis> | |
958 | +</listitem> | |
959 | + | |
960 | +<listitem> | |
961 | +<cmdsynopsis> | |
962 | <command><link linkend="crypt-hook">crypt-hook</link></command> | |
963 | <arg choice="plain"> | |
964 | <replaceable class="parameter">pattern</replaceable> | |
965 | diff -udprP mutt-1.5.19.orig/doc/Muttrc.head mutt-1.5.19/doc/Muttrc.head | |
966 | --- mutt-1.5.19.orig/doc/Muttrc.head 2008-06-14 03:08:43.000000000 +0300 | |
967 | +++ mutt-1.5.19/doc/Muttrc.head 2009-01-06 19:16:04.000000000 +0200 | |
968 | @@ -29,6 +29,17 @@ macro generic,pager <F1> "<shell-escape> | |
969 | macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list" | |
970 | bind browser y exit | |
971 | ||
972 | +# Use folders which match on \\.gz$ as gzipped folders: | |
973 | +open-hook \\.gz$ "gzip -cd %f > %t" | |
974 | +close-hook \\.gz$ "gzip -c %t > %f" | |
975 | +append-hook \\.gz$ "gzip -c %t >> %f" | |
976 | +open-hook \\.bz2$ "bzip2 -cd %f > %t" | |
977 | +close-hook \\.bz2$ "bzip2 -c %t > %f" | |
978 | +append-hook \\.bz2$ "bzip2 -c %t >> %f" | |
979 | +open-hook \\.xz$ "xz -cd %f > %t" | |
980 | +close-hook \\.xz$ "xz -c %t > %f" | |
981 | +append-hook \\.xz$ "xz -c %t >> %f" | |
982 | + | |
983 | # If Mutt is unable to determine your site's domain name correctly, you can | |
984 | # set the default here. | |
985 | # | |
986 | diff -udprP mutt-1.5.19.orig/doc/muttrc.man.head mutt-1.5.19/doc/muttrc.man.head | |
987 | --- mutt-1.5.19.orig/doc/muttrc.man.head 2008-11-26 20:48:48.000000000 +0200 | |
988 | +++ mutt-1.5.19/doc/muttrc.man.head 2009-01-06 19:16:04.000000000 +0200 | |
989 | @@ -345,6 +345,24 @@ specify the ID of the public key to be u | |
990 | to a certain recipient. The meaning of "key ID" is to be taken | |
991 | broadly: This can be a different e-mail address, a numerical key ID, | |
992 | or even just an arbitrary search string. | |
993 | +.PP | |
994 | +.nf | |
995 | +\fBopen-hook\fP \fIregexp\fP "\fIcommand\fP" | |
996 | +\fBclose-hook\fP \fIregexp\fP "\fIcommand\fP" | |
997 | +\fBappend-hook\fP \fIregexp\fP "\fIcommand\fP" | |
998 | +.fi | |
999 | +.IP | |
1000 | +These commands provide a way to handle compressed folders. The given | |
1001 | +\fBregexp\fP specifies which folders are taken as compressed (e.g. | |
1002 | +"\fI\\\\.gz$\fP"). The commands tell Mutt how to uncompress a folder | |
1003 | +(\fBopen-hook\fP), compress a folder (\fBclose-hook\fP) or append a | |
1004 | +compressed mail to a compressed folder (\fBappend-hook\fP). The | |
1005 | +\fIcommand\fP string is the | |
1006 | +.BR printf (3) | |
1007 | +like format string, and it should accept two parameters: \fB%f\fP, | |
1008 | +which is replaced with the (compressed) folder name, and \fB%t\fP | |
1009 | +which is replaced with the name of the temporary folder to which to | |
1010 | +write. | |
1011 | .TP | |
1012 | \fBpush\fP \fIstring\fP | |
1013 | This command adds the named \fIstring\fP to the keyboard buffer. | |
1014 | diff -udprP mutt-1.5.19.orig/hook.c mutt-1.5.19/hook.c | |
1015 | --- mutt-1.5.19.orig/hook.c 2009-01-05 21:20:53.000000000 +0200 | |
1016 | +++ mutt-1.5.19/hook.c 2009-01-06 19:16:04.000000000 +0200 | |
1017 | @@ -24,6 +24,10 @@ | |
1018 | #include "mailbox.h" | |
1019 | #include "mutt_crypt.h" | |
1020 | ||
1021 | +#ifdef USE_COMPRESSED | |
1022 | +#include "compress.h" | |
1023 | +#endif | |
1024 | + | |
1025 | #include <limits.h> | |
1026 | #include <string.h> | |
1027 | #include <stdlib.h> | |
1028 | @@ -92,6 +96,16 @@ int mutt_parse_hook (BUFFER *buf, BUFFER | |
1029 | memset (&pattern, 0, sizeof (pattern)); | |
1030 | pattern.data = safe_strdup (path); | |
1031 | } | |
1032 | +#ifdef USE_COMPRESSED | |
1033 | + else if (data & (M_APPENDHOOK | M_OPENHOOK | M_CLOSEHOOK)) | |
1034 | + { | |
1035 | + if (mutt_test_compress_command (command.data)) | |
1036 | + { | |
1037 | + strfcpy (err->data, _("bad formatted command string"), err->dsize); | |
1038 | + return (-1); | |
1039 | + } | |
1040 | + } | |
1041 | +#endif | |
1042 | else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ICONVHOOK | M_ACCOUNTHOOK)) | |
1043 | && (!WithCrypto || !(data & M_CRYPTHOOK)) | |
1044 | ) | |
1045 | diff -udprP mutt-1.5.19.orig/init.h mutt-1.5.19/init.h | |
1046 | --- mutt-1.5.19.orig/init.h 2009-01-05 21:20:53.000000000 +0200 | |
1047 | +++ mutt-1.5.19/init.h 2009-01-06 19:16:04.000000000 +0200 | |
1048 | @@ -3398,6 +3398,11 @@ struct command_t Commands[] = { | |
1049 | { "fcc-hook", mutt_parse_hook, M_FCCHOOK }, | |
1050 | { "fcc-save-hook", mutt_parse_hook, M_FCCHOOK | M_SAVEHOOK }, | |
1051 | { "folder-hook", mutt_parse_hook, M_FOLDERHOOK }, | |
1052 | +#ifdef USE_COMPRESSED | |
1053 | + { "open-hook", mutt_parse_hook, M_OPENHOOK }, | |
1054 | + { "close-hook", mutt_parse_hook, M_CLOSEHOOK }, | |
1055 | + { "append-hook", mutt_parse_hook, M_APPENDHOOK }, | |
1056 | +#endif | |
1057 | { "group", parse_group, 0 }, | |
1058 | { "ungroup", parse_ungroup, 0 }, | |
1059 | { "hdr_order", parse_list, UL &HeaderOrderList }, | |
1060 | diff -udprP mutt-1.5.19.orig/main.c mutt-1.5.19/main.c | |
1061 | --- mutt-1.5.19.orig/main.c 2009-01-04 01:27:10.000000000 +0200 | |
1062 | +++ mutt-1.5.19/main.c 2009-01-06 19:16:04.000000000 +0200 | |
1063 | @@ -311,6 +311,12 @@ static void show_version (void) | |
1064 | "-USE_GNU_REGEX " | |
1065 | #endif | |
1066 | ||
1067 | +#ifdef USE_COMPRESSED | |
1068 | + "+COMPRESSED " | |
1069 | +#else | |
1070 | + "-COMPRESSED " | |
1071 | +#endif | |
1072 | + | |
1073 | "\n" | |
1074 | ||
1075 | #ifdef HAVE_COLOR | |
1076 | diff -udprP mutt-1.5.19.orig/Makefile.am mutt-1.5.19/Makefile.am | |
1077 | --- mutt-1.5.19.orig/Makefile.am 2009-01-05 21:20:53.000000000 +0200 | |
1078 | +++ mutt-1.5.19/Makefile.am 2009-01-06 19:16:04.000000000 +0200 | |
1079 | @@ -18,6 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist. | |
1080 | bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ | |
1081 | mutt_SOURCES = \ | |
1082 | addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ | |
1083 | + compress.c \ | |
1084 | crypt.c cryptglue.c \ | |
1085 | commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \ | |
1086 | edit.c enter.c flags.c init.c filter.c from.c \ | |
1087 | @@ -58,6 +59,7 @@ EXTRA_mutt_SOURCES = account.c bcache.c | |
1088 | ||
1089 | EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ | |
1090 | configure account.h \ | |
1091 | + compress.h \ | |
1092 | attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \ | |
1093 | globals.h hash.h history.h init.h keymap.h mutt_crypt.h \ | |
1094 | mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \ | |
1095 | diff -udprP mutt-1.5.19.orig/Makefile.in mutt-1.5.19/Makefile.in | |
1096 | --- mutt-1.5.19.orig/Makefile.in 2009-01-05 21:24:13.000000000 +0200 | |
1097 | +++ mutt-1.5.19/Makefile.in 2009-01-06 19:16:04.000000000 +0200 | |
1098 | @@ -14,6 +14,10 @@ | |
1099 | ||
1100 | @SET_MAKE@ | |
1101 | ||
1102 | +mutt_SOURCES += compress.c | |
1103 | +EXTRA_DIST += compress.h | |
1104 | +mutt_OBJECTS += compress.o | |
1105 | + | |
1106 | ||
1107 | VPATH = @srcdir@ | |
1108 | pkgdatadir = $(datadir)/@PACKAGE@ | |
1109 | diff -udprP mutt-1.5.19.orig/mbox.c mutt-1.5.19/mbox.c | |
1110 | --- mutt-1.5.19.orig/mbox.c 2008-08-15 21:30:12.000000000 +0300 | |
1111 | +++ mutt-1.5.19/mbox.c 2009-01-06 19:16:04.000000000 +0200 | |
1112 | @@ -29,6 +29,10 @@ | |
1113 | #include "copy.h" | |
1114 | #include "mutt_curses.h" | |
1115 | ||
1116 | +#ifdef USE_COMPRESSED | |
1117 | +#include "compress.h" | |
1118 | +#endif | |
1119 | + | |
1120 | #include <sys/stat.h> | |
1121 | #include <dirent.h> | |
1122 | #include <string.h> | |
1123 | @@ -1038,6 +1042,12 @@ bail: /* Come here in case of disaster | |
1124 | int mbox_close_mailbox (CONTEXT *ctx) | |
1125 | { | |
1126 | mx_unlock_file (ctx->path, fileno (ctx->fp), 1); | |
1127 | + | |
1128 | +#ifdef USE_COMPRESSED | |
1129 | + if (ctx->compressinfo) | |
1130 | + mutt_slow_close_compressed (ctx); | |
1131 | +#endif | |
1132 | + | |
1133 | mutt_unblock_signals (); | |
1134 | mx_fastclose_mailbox (ctx); | |
1135 | return 0; | |
1136 | diff -udprP mutt-1.5.19.orig/mutt.h mutt-1.5.19/mutt.h | |
1137 | --- mutt-1.5.19.orig/mutt.h 2008-09-26 01:00:03.000000000 +0300 | |
1138 | +++ mutt-1.5.19/mutt.h 2009-01-06 19:16:04.000000000 +0200 | |
1139 | @@ -140,6 +140,11 @@ typedef enum | |
1140 | #define M_ACCOUNTHOOK (1<<9) | |
1141 | #define M_REPLYHOOK (1<<10) | |
1142 | #define M_SEND2HOOK (1<<11) | |
1143 | +#ifdef USE_COMPRESSED | |
1144 | +#define M_OPENHOOK (1<<12) | |
1145 | +#define M_APPENDHOOK (1<<13) | |
1146 | +#define M_CLOSEHOOK (1<<14) | |
1147 | +#endif | |
1148 | ||
1149 | /* tree characters for linearize_tree and print_enriched_string */ | |
1150 | #define M_TREE_LLCORNER 1 | |
1151 | @@ -869,6 +874,11 @@ typedef struct _context | |
1152 | ||
1153 | unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */ | |
1154 | ||
1155 | +#ifdef USE_COMPRESSED | |
1156 | + void *compressinfo; /* compressed mbox module private data */ | |
1157 | + char *realpath; /* path to compressed mailbox */ | |
1158 | +#endif /* USE_COMPRESSED */ | |
1159 | + | |
1160 | unsigned int locked : 1; /* is the mailbox locked? */ | |
1161 | unsigned int changed : 1; /* mailbox has been modified */ | |
1162 | unsigned int readonly : 1; /* don't allow changes to the mailbox */ | |
1163 | diff -udprP mutt-1.5.19.orig/mx.c mutt-1.5.19/mx.c | |
1164 | --- mutt-1.5.19.orig/mx.c 2009-01-05 21:20:53.000000000 +0200 | |
1165 | +++ mutt-1.5.19/mx.c 2009-01-06 19:16:04.000000000 +0200 | |
1166 | @@ -30,6 +30,10 @@ | |
1167 | #include "keymap.h" | |
1168 | #include "url.h" | |
1169 | ||
1170 | +#ifdef USE_COMPRESSED | |
1171 | +#include "compress.h" | |
1172 | +#endif | |
1173 | + | |
1174 | #ifdef USE_IMAP | |
1175 | #include "imap.h" | |
1176 | #endif | |
1177 | @@ -445,6 +449,11 @@ int mx_get_magic (const char *path) | |
1178 | return (-1); | |
1179 | } | |
1180 | ||
1181 | +#ifdef USE_COMPRESSED | |
1182 | + if (magic == 0 && mutt_can_read_compressed (path)) | |
1183 | + return M_COMPRESSED; | |
1184 | +#endif | |
1185 | + | |
1186 | return (magic); | |
1187 | } | |
1188 | ||
1189 | @@ -484,6 +493,13 @@ static int mx_open_mailbox_append (CONTE | |
1190 | { | |
1191 | struct stat sb; | |
1192 | ||
1193 | +#ifdef USE_COMPRESSED | |
1194 | + /* special case for appending to compressed folders - | |
1195 | + * even if we can not open them for reading */ | |
1196 | + if (mutt_can_append_compressed (ctx->path)) | |
1197 | + mutt_open_append_compressed (ctx); | |
1198 | +#endif | |
1199 | + | |
1200 | ctx->append = 1; | |
1201 | ||
1202 | #ifdef USE_IMAP | |
1203 | @@ -648,6 +664,11 @@ CONTEXT *mx_open_mailbox (const char *pa | |
1204 | ||
1205 | ctx->magic = mx_get_magic (path); | |
1206 | ||
1207 | +#ifdef USE_COMPRESSED | |
1208 | + if (ctx->magic == M_COMPRESSED) | |
1209 | + mutt_open_read_compressed (ctx); | |
1210 | +#endif | |
1211 | + | |
1212 | if(ctx->magic == 0) | |
1213 | mutt_error (_("%s is not a mailbox."), path); | |
1214 | ||
1215 | @@ -748,6 +769,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx) | |
1216 | mutt_free_header (&ctx->hdrs[i]); | |
1217 | FREE (&ctx->hdrs); | |
1218 | FREE (&ctx->v2r); | |
1219 | +#ifdef USE_COMPRESSED | |
1220 | + if (ctx->compressinfo) | |
1221 | + mutt_fast_close_compressed (ctx); | |
1222 | +#endif | |
1223 | FREE (&ctx->path); | |
1224 | FREE (&ctx->pattern); | |
1225 | if (ctx->limit_pattern) | |
1226 | @@ -800,6 +825,12 @@ static int sync_mailbox (CONTEXT *ctx, i | |
1227 | ||
1228 | if (tmp && tmp->new == 0) | |
1229 | mutt_update_mailbox (tmp); | |
1230 | + | |
1231 | +#ifdef USE_COMPRESSED | |
1232 | + if (rc == 0 && ctx->compressinfo) | |
1233 | + return mutt_sync_compressed (ctx); | |
1234 | +#endif | |
1235 | + | |
1236 | return rc; | |
1237 | } | |
1238 | ||
1239 | @@ -1001,6 +1032,11 @@ int mx_close_mailbox (CONTEXT *ctx, int | |
1240 | !mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY)) | |
1241 | mx_unlink_empty (ctx->path); | |
1242 | ||
1243 | +#ifdef USE_COMPRESSED | |
1244 | + if (ctx->compressinfo && mutt_slow_close_compressed (ctx)) | |
1245 | + return (-1); | |
1246 | +#endif | |
1247 | + | |
1248 | mx_fastclose_mailbox (ctx); | |
1249 | ||
1250 | return 0; | |
1251 | @@ -1310,6 +1346,11 @@ int mx_check_mailbox (CONTEXT *ctx, int | |
1252 | { | |
1253 | int rc; | |
1254 | ||
1255 | +#ifdef USE_COMPRESSED | |
1256 | + if (ctx->compressinfo) | |
1257 | + return mutt_check_mailbox_compressed (ctx); | |
1258 | +#endif | |
1259 | + | |
1260 | if (ctx) | |
1261 | { | |
1262 | if (ctx->locked) lock = 0; | |
1263 | diff -udprP mutt-1.5.19.orig/mx.h mutt-1.5.19/mx.h | |
1264 | --- mutt-1.5.19.orig/mx.h 2008-03-19 22:07:06.000000000 +0200 | |
1265 | +++ mutt-1.5.19/mx.h 2009-01-06 19:16:04.000000000 +0200 | |
1266 | @@ -40,6 +40,9 @@ enum | |
1267 | #ifdef USE_POP | |
1268 | , M_POP | |
1269 | #endif | |
1270 | +#ifdef USE_COMPRESSED | |
1271 | + , M_COMPRESSED | |
1272 | +#endif | |
1273 | }; | |
1274 | ||
1275 | WHERE short DefaultMagic INITVAL (M_MBOX); | |
1276 | diff -udprP mutt-1.5.19.orig/PATCHES mutt-1.5.19/PATCHES | |
1277 | --- mutt-1.5.19.orig/PATCHES 2008-03-19 22:07:06.000000000 +0200 | |
1278 | +++ mutt-1.5.19/PATCHES 2009-01-06 19:16:04.000000000 +0200 | |
1279 | @@ -0,0 +1 @@ | |
1280 | +rr.compressed | |
1281 | diff -udprP mutt-1.5.19.orig/po/POTFILES.in mutt-1.5.19/po/POTFILES.in | |
1282 | --- mutt-1.5.19.orig/po/POTFILES.in 2008-03-19 22:07:57.000000000 +0200 | |
1283 | +++ mutt-1.5.19/po/POTFILES.in 2009-01-06 19:16:04.000000000 +0200 | |
1284 | @@ -8,6 +8,7 @@ charset.c | |
1285 | color.c | |
1286 | commands.c | |
1287 | compose.c | |
1288 | +compress.c | |
1289 | crypt-gpgme.c | |
1290 | crypt.c | |
1291 | cryptglue.c | |
1292 | diff -udprP mutt-1.5.19.orig/status.c mutt-1.5.19/status.c | |
1293 | --- mutt-1.5.19.orig/status.c 2009-01-05 21:20:53.000000000 +0200 | |
1294 | +++ mutt-1.5.19/status.c 2009-01-06 19:16:04.000000000 +0200 | |
1295 | @@ -96,6 +96,14 @@ status_format_str (char *buf, size_t buf | |
1296 | ||
1297 | case 'f': | |
1298 | snprintf (fmt, sizeof(fmt), "%%%ss", prefix); | |
1299 | +#ifdef USE_COMPRESSED | |
1300 | + if (Context && Context->compressinfo && Context->realpath) | |
1301 | + { | |
1302 | + strfcpy (tmp, Context->realpath, sizeof (tmp)); | |
1303 | + mutt_pretty_mailbox (tmp, sizeof (tmp)); | |
1304 | + } | |
1305 | + else | |
1306 | +#endif | |
1307 | if (Context && Context->path) | |
1308 | { | |
1309 | strfcpy (tmp, Context->path, sizeof (tmp)); |