X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=blobdiff_plain;f=mutt-rr.compressed.patch;h=46ba156fecc22c93bb74719b08e679d5800451b0;hp=e5988bb59ef38df365d2d170ef2d8174a51bd58a;hb=b324a978caa4a15a3e53605acdb7559a705c8e7f;hpb=643a7814d14bbc931036606305dd58a44c555151 diff --git a/mutt-rr.compressed.patch b/mutt-rr.compressed.patch index e5988bb..46ba156 100644 --- a/mutt-rr.compressed.patch +++ b/mutt-rr.compressed.patch @@ -1,74 +1,7 @@ -diff -Nur mutt-1.3.27.orig/Makefile.am mutt-1.3.27/Makefile.am ---- mutt-1.3.27.orig/Makefile.am Fri Nov 9 01:18:28 2001 -+++ mutt-1.3.27/Makefile.am Fri Feb 1 22:51:32 2002 -@@ -18,7 +18,8 @@ - bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ - mutt_SOURCES = $(BUILT_SOURCES) \ - addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ -- commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \ -+ commands.c complete.c compose.c compress.c copy.c curs_lib.c \ -+ curs_main.c date.c \ - edit.c enter.c flags.c init.c filter.c from.c getdomain.c \ - handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \ - main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \ -@@ -70,8 +71,8 @@ - browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c pgppacket.c - - EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP TODO configure acconfig.h account.h \ -- attach.h buffy.h charset.h copy.h dotlock.h functions.h gen_defs \ -- globals.h hash.h history.h init.h keymap.h \ -+ attach.h buffy.h charset.h compress.h copy.h dotlock.h functions.h \ -+ gen_defs globals.h hash.h history.h init.h keymap.h \ - mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \ - mutt_regex.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \ - mx.h pager.h pgp.h pop.h protos.h reldate.h rfc1524.h rfc2047.h \ -diff -Nur mutt-1.3.27.orig/Muttrc.head mutt-1.3.27/Muttrc.head ---- mutt-1.3.27.orig/Muttrc.head Tue Jan 1 21:18:02 2002 -+++ mutt-1.3.27/Muttrc.head Fri Feb 1 22:51:32 2002 -@@ -19,6 +19,15 @@ - macro index "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation" - macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation" - -+# Use folders which match on \\.gz$ as gzipped folders: -+# open-hook \\.gz$ "gzip -cd %f > %t" -+# close-hook \\.gz$ "gzip -c %t > %f" -+# append-hook \\.gz$ "gzip -c %t >> %f" -+ -+# open-hook \\.bz2$ "bzip2 -cd %f > %t" -+# close-hook \\.bz2$ "bzip2 -c %t > %f" -+# append-hook \\.bz2$ "bzip2 -c %t >> %f" -+ - # If Mutt is unable to determine your site's domain name correctly, you can - # set the default here. - # -diff -Nur mutt-1.3.27.orig/Muttrc.head.in mutt-1.3.27/Muttrc.head.in ---- mutt-1.3.27.orig/Muttrc.head.in Mon Mar 20 11:25:49 2000 -+++ mutt-1.3.27/Muttrc.head.in Fri Feb 1 22:51:32 2002 -@@ -19,6 +19,15 @@ - macro index "!less @docdir@/manual.txt\n" "Show Mutt documentation" - macro pager "!less @docdir@/manual.txt\n" "Show Mutt documentation" - -+# Use folders which match on \\.gz$ as gzipped folders: -+# open-hook \\.gz$ "gzip -cd %f > %t" -+# close-hook \\.gz$ "gzip -c %t > %f" -+# append-hook \\.gz$ "gzip -c %t >> %f" -+ -+# open-hook \\.bz2$ "bzip2 -cd %f > %t" -+# close-hook \\.bz2$ "bzip2 -c %t > %f" -+# append-hook \\.bz2$ "bzip2 -c %t >> %f" -+ - # If Mutt is unable to determine your site's domain name correctly, you can - # set the default here. - # -diff -Nur mutt-1.3.27.orig/PATCHES mutt-1.3.27/PATCHES ---- mutt-1.3.27.orig/PATCHES Mon Nov 26 20:16:22 2001 -+++ mutt-1.3.27/PATCHES Fri Feb 1 22:51:32 2002 -@@ -0,0 +1 @@ -+patch-1.3.27.rr.compressed.1 -diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c ---- mutt-1.3.27.orig/compress.c Thu Jan 1 01:00:00 1970 -+++ mutt-1.3.27/compress.c Fri Feb 1 22:51:32 2002 -@@ -0,0 +1,483 @@ +diff -udprP mutt-1.5.19.orig/compress.c mutt-1.5.19/compress.c +--- mutt-1.5.19.orig/compress.c 1970-01-01 03:00:00.000000000 +0300 ++++ mutt-1.5.19/compress.c 2009-01-06 19:16:04.000000000 +0200 +@@ -0,0 +1,490 @@ +/* + * Copyright (C) 1997 Alain Penders + * @@ -87,6 +20,10 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#if HAVE_CONFIG_H ++# include "config.h" ++#endif ++ +#include "mutt.h" + +#ifdef USE_COMPRESSED @@ -108,8 +45,9 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + off_t size; /* size of real folder */ +} COMPRESS_INFO; + ++char echo_cmd[HUGE_STRING]; + -+/* ++/* parameters: + * ctx - context to lock + * excl - exclusive lock? + * retry - should retry if unable to lock? @@ -156,16 +94,15 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + return find_compress_hook (M_OPENHOOK, path) ? 1 : 0; +} + -+/* -+ * if the file is new, we really do not append, but create, and so use -+ * close-hook, and not append-hook ++/* if the file is new, we really do not append, but create, and so use ++ * close-hook, and not append-hook + */ +static const char* get_append_command (const char *path, const CONTEXT* ctx) +{ + COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; + return (is_new (path)) ? ci->close : ci->append; +} -+ ++ +int mutt_can_append_compressed (const char *path) +{ + int magic; @@ -174,12 +111,12 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + return (find_compress_hook (M_CLOSEHOOK, path) ? 1 : 0); + + magic = mx_get_magic (path); -+ ++ + if (magic != 0 && magic != M_COMPRESSED) + return 0; + + return (find_compress_hook (M_APPENDHOOK, path) -+ || (find_compress_hook (M_OPENHOOK, path) ++ || (find_compress_hook (M_OPENHOOK, path) + && find_compress_hook (M_CLOSEHOOK, path))) ? 1 : 0; +} + @@ -196,7 +133,7 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + ci->close = find_compress_hook (M_CLOSEHOOK, ctx->path); + return ci; +} -+ ++ +static void set_path (CONTEXT* ctx) +{ + char tmppath[_POSIX_PATH_MAX]; @@ -205,12 +142,12 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + ctx->realpath = ctx->path; + + /* Uncompress to /tmp */ -+ mutt_mktemp (tmppath); ++ mutt_mktemp (tmppath, sizeof(tmppath)); + ctx->path = safe_malloc (strlen (tmppath) + 1); + strcpy (ctx->path, tmppath); +} + -+static int get_size (const char* path) ++static int get_size (const char* path) +{ + struct stat sb; + if (stat (path, &sb) != 0) @@ -218,20 +155,20 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + return (sb.st_size); +} + -+static void store_size (CONTEXT* ctx) ++static void store_size (CONTEXT* ctx) +{ + COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; + ci->size = get_size (ctx->realpath); +} + +static const char * -+compresshook_format_str (char *dest, size_t destlen, char op, const char *src, -+ const char *fmt, const char *ifstring, -+ const char *elsestring, unsigned long data, ++compresshook_format_str (char *dest, size_t destlen, size_t col, char op, ++ const char *src, const char *fmt, const char *ifstring, ++ const char *elsestring, unsigned long data, + format_flag flags) +{ + char tmp[SHORT_STRING]; -+ ++ + CONTEXT *ctx = (CONTEXT *) data; + switch (op) + { @@ -247,8 +184,7 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + return (src); +} + -+/* -+ * check that the command has both %f and %t ++/* check that the command has both %f and %t + * 0 means OK, -1 means error + */ +int mutt_test_compress_command (const char* cmd) @@ -259,7 +195,7 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c +static char *get_compression_cmd (const char* cmd, const CONTEXT* ctx) +{ + char expanded[_POSIX_PATH_MAX]; -+ mutt_FormatString (expanded, sizeof (expanded), cmd, compresshook_format_str, ++ mutt_FormatString (expanded, sizeof (expanded), 0, cmd, compresshook_format_str, + (unsigned long) ctx, 0); + return safe_strdup (expanded); +} @@ -269,8 +205,8 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; + if (ci->size != get_size (ctx->realpath)) + { -+ safe_free ((void**)&ctx->compressinfo); -+ safe_free ((void**)&ctx->realpath); ++ FREE (&ctx->compressinfo); ++ FREE (&ctx->realpath); + mutt_error _("Mailbox was corrupted!"); + return (-1); + } @@ -286,7 +222,7 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + COMPRESS_INFO *ci = set_compress_info (ctx); + if (!ci->open) { + ctx->magic = 0; -+ safe_free ((void**)ctx->compressinfo); ++ FREE (ctx->compressinfo); + return (-1); + } + if (!ci->close || access (ctx->path, W_OK) != 0) @@ -299,14 +235,14 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + mutt_message (_("Decompressing %s..."), ctx->realpath); + + cmd = get_compression_cmd (ci->open, ctx); -+ if (cmd == NULL) ++ if (cmd == NULL) + return (-1); + dprint (2, (debugfile, "DecompressCmd: '%s'\n", cmd)); + + if ((fp = fopen (ctx->realpath, "r")) == NULL) + { + mutt_perror (ctx->realpath); -+ safe_free ((void **)&cmd); ++ FREE (&cmd); + return (-1); + } + mutt_block_signals (); @@ -315,13 +251,14 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + fclose (fp); + mutt_unblock_signals (); + mutt_error _("Unable to lock mailbox!"); -+ safe_free ((void **)&cmd); ++ FREE (&cmd); + return (-1); + } + + endwin (); + fflush (stdout); -+ fprintf (stderr, _("Decompressing %s...\n"),ctx->realpath); ++ sprintf(echo_cmd,_("echo Decompressing %s..."),ctx->realpath); ++ mutt_system(echo_cmd); + rc = mutt_system (cmd); + mbox_unlock_compressed (ctx, fp); + mutt_unblock_signals (); @@ -331,11 +268,11 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + { + mutt_any_key_to_continue (NULL); + ctx->magic = 0; -+ safe_free ((void**)ctx->compressinfo); ++ FREE (ctx->compressinfo); + mutt_error (_("Error executing: %s : unable to open the mailbox!\n"), cmd); + } -+ safe_free ((void **)&cmd); -+ if (rc) ++ FREE (&cmd); ++ if (rc) + return (-1); + + if (mutt_check_mailbox_compressed (ctx)) @@ -348,12 +285,12 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + +void restore_path (CONTEXT* ctx) +{ -+ safe_free ((void **)&ctx->path); ++ FREE (&ctx->path); + ctx->path = ctx->realpath; +} + +/* remove the temporary mailbox */ -+void remove_file (CONTEXT* ctx) ++void remove_file (CONTEXT* ctx) +{ + if (ctx->magic == M_MBOX || ctx->magic == M_MMDF) + remove (ctx->path); @@ -370,7 +307,7 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + return (mutt_open_read_compressed (ctx)); + + ctx->magic = 0; -+ safe_free ((void**)&ctx->compressinfo); ++ FREE (&ctx->compressinfo); + return (-1); + } + @@ -399,15 +336,13 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + fclose (ctx->fp); + ctx->fp = NULL; + /* if the folder was removed, remove the gzipped folder too */ -+ if ((ctx->magic > 0) -+ && (access (ctx->path, F_OK) != 0) -+ && ! option (OPTSAVEEMPTY)) ++ if (access (ctx->path, F_OK) != 0 && ! option (OPTSAVEEMPTY)) + remove (ctx->realpath); + else + remove_file (ctx); + + restore_path (ctx); -+ safe_free ((void**)&ctx->compressinfo); ++ FREE (&ctx->compressinfo); + } +} + @@ -423,13 +358,13 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + mutt_message (_("Compressing %s..."), ctx->realpath); + + cmd = get_compression_cmd (ci->close, ctx); -+ if (cmd == NULL) ++ if (cmd == NULL) + return (-1); + + if ((fp = fopen (ctx->realpath, "a")) == NULL) + { + mutt_perror (ctx->realpath); -+ safe_free ((void **)&cmd); ++ FREE (&cmd); + return (-1); + } + mutt_block_signals (); @@ -438,8 +373,10 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + fclose (fp); + mutt_unblock_signals (); + mutt_error _("Unable to lock mailbox!"); -+ store_size (ctx); -+ safe_free ((void **)&cmd); ++ ++ store_size (ctx); ++ ++ FREE (&cmd); + return (-1); + } + @@ -447,7 +384,8 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + + endwin (); + fflush (stdout); -+ fprintf (stderr, _("Compressing %s...\n"), ctx->realpath); ++ sprintf(echo_cmd,_("echo Compressing %s..."), ctx->realpath); ++ mutt_system(echo_cmd); + if (mutt_system (cmd)) + { + mutt_any_key_to_continue (NULL); @@ -459,8 +397,8 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + mutt_unblock_signals (); + fclose (fp); + -+ safe_free ((void **)&cmd); -+ ++ FREE (&cmd); ++ + store_size (ctx); + + return (rc); @@ -473,15 +411,16 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + char *cmd; + COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; + -+ dprint (2, (debugfile, "mutt_slow_close_compressed called on '%s'\n", ++ dprint (2, (debugfile, "mutt_slow_close_compressed called on '%s'\n", + ctx->path)); + -+ if (! (ctx->append ++ if (! (ctx->append + && ((append = get_append_command (ctx->realpath, ctx)) + || (append = ci->close)))) -+ { -+ /* if we can not or should not append, we only have to remove the */ -+ /* compressed info, because sync was already called */ ++ { /* if we can not or should not append, ++ * we only have to remove the compressed info, because sync was already ++ * called ++ */ + mutt_fast_close_compressed (ctx); + return (0); + } @@ -499,13 +438,13 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + } + + cmd = get_compression_cmd (append, ctx); -+ if (cmd == NULL) ++ if (cmd == NULL) + return (-1); + + if ((fp = fopen (ctx->realpath, "a")) == NULL) + { + mutt_perror (ctx->realpath); -+ safe_free ((void **)&cmd); ++ FREE (&cmd); + return (-1); + } + mutt_block_signals (); @@ -514,7 +453,7 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + fclose (fp); + mutt_unblock_signals (); + mutt_error _("Unable to lock mailbox!"); -+ safe_free ((void **)&cmd); ++ FREE (&cmd); + return (-1); + } + @@ -524,16 +463,17 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + fflush (stdout); + + if (append == ci->close) -+ fprintf (stderr, _("Compressing %s...\n"), ctx->realpath); ++ sprintf(echo_cmd,_("echo Compressing %s..."), ctx->realpath); + else -+ fprintf (stderr, _("Compressed-appending to %s...\n"), ctx->realpath); ++ sprintf(echo_cmd,_("echo Compressed-appending to %s..."), ctx->realpath); ++ mutt_system(echo_cmd); + + if (mutt_system (cmd)) + { + mutt_any_key_to_continue (NULL); + mutt_error (_(" %s: Error compressing mailbox! Uncompressed one kept!\n"), + ctx->path); -+ safe_free ((void **)&cmd); ++ FREE (&cmd); + mbox_unlock_compressed (ctx, fp); + mutt_unblock_signals (); + fclose (fp); @@ -545,16 +485,16 @@ diff -Nur mutt-1.3.27.orig/compress.c mutt-1.3.27/compress.c + fclose (fp); + remove_file (ctx); + restore_path (ctx); -+ safe_free ((void **)&cmd); -+ safe_free ((void **)&ctx->compressinfo); ++ FREE (&cmd); ++ FREE (&ctx->compressinfo); + + return (0); +} + +#endif /* USE_COMPRESSED */ -diff -Nur mutt-1.3.27.orig/compress.h mutt-1.3.27/compress.h ---- mutt-1.3.27.orig/compress.h Thu Jan 1 01:00:00 1970 -+++ mutt-1.3.27/compress.h Fri Feb 1 22:51:32 2002 +diff -udprP mutt-1.5.19.orig/compress.h mutt-1.5.19/compress.h +--- mutt-1.5.19.orig/compress.h 1970-01-01 03:00:00.000000000 +0300 ++++ mutt-1.5.19/compress.h 2009-01-06 19:16:04.000000000 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -583,25 +523,68 @@ diff -Nur mutt-1.3.27.orig/compress.h mutt-1.3.27/compress.h +int mutt_test_compress_command (const char *); +int mutt_check_mailbox_compressed (CONTEXT *); +void mutt_fast_close_compressed (CONTEXT *); -diff -Nur mutt-1.3.27.orig/configure.in mutt-1.3.27/configure.in ---- mutt-1.3.27.orig/configure.in Fri Feb 1 22:51:17 2002 -+++ mutt-1.3.27/configure.in Fri Feb 1 22:51:32 2002 -@@ -644,6 +644,11 @@ - AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) +diff -udprP mutt-1.5.19.orig/config.h.in mutt-1.5.19/config.h.in +--- mutt-1.5.19.orig/config.h.in 2008-11-18 01:54:00.000000000 +0200 ++++ mutt-1.5.19/config.h.in 2009-01-06 19:16:04.000000000 +0200 +@@ -521,6 +521,9 @@ + + /* Define to enable Sun mailtool attachments support. */ + #undef SUN_ATTACHMENT ++ ++/* The compressed mailboxes support */ ++#undef USE_COMPRESSED + + /* Define to use dotlocking for mailboxes. */ + #undef USE_DOTLOCK +diff -udprP mutt-1.5.19.orig/configure mutt-1.5.19/configure +--- mutt-1.5.19.orig/configure 2008-11-18 01:53:41.000000000 +0200 ++++ mutt-1.5.19/configure 2009-01-06 19:16:04.000000000 +0200 +@@ -1366,6 +1366,7 @@ Optional Features: + --disable-warnings Turn off compiler warnings (not recommended) + --enable-nfs-fix Work around an NFS with broken attributes caching + --enable-mailtool Enable Sun mailtool attachments support ++ --enable-compressed Enable compressed folders support + --enable-locales-fix The result of isprint() is unreliable + --enable-exact-address Enable regeneration of email addresses + --enable-hcache Enable header caching +@@ -12978,6 +12979,18 @@ echo "${ECHO_T}$mutt_cv_regex_broken" >& + fi + fi + ++ ++# Check whether --enable-compressed or --disable-compressed was given. ++if test "${enable_compressed+set}" = set; then ++ enableval="$enable_compressed" ++ if test x$enableval = xyes; then ++ cat >> confdefs.h <<\EOF ++#define USE_COMPRESSED 1 ++EOF ++ ++ fi ++fi ++ + if test $mutt_cv_regex = yes; then + + cat >>confdefs.h <<\_ACEOF +diff -udprP mutt-1.5.19.orig/configure.ac mutt-1.5.19/configure.ac +--- mutt-1.5.19.orig/configure.ac 2008-11-17 22:15:26.000000000 +0200 ++++ mutt-1.5.19/configure.ac 2009-01-06 19:16:04.000000000 +0200 +@@ -807,6 +807,11 @@ AC_ARG_ENABLE(mailtool, AC_HELP_STRING([ + AC_DEFINE(SUN_ATTACHMENT,1,[ Define to enable Sun mailtool attachments support. ]) fi]) -+AC_ARG_ENABLE(compressed, [ --enable-compressed Enable compressed folders support ], -+ [if test x$enableval = xyes; then -+ AC_DEFINE(USE_COMPRESSED,1, [ Define to support compressed folders. ]) ++AC_ARG_ENABLE(compressed, AC_HELP_STRING([--enable-compressed], [Enable compressed folders support]), ++ [if test x$enableval = xyes; then ++ AC_DEFINE(USE_COMPRESSED,1,[ Define to enable compressed folders support. ]) + fi]) + - AC_ARG_WITH(exec-shell, [ --with-exec-shell=SHELL Specify alternate shell (ONLY if /bin/sh is broken)], - [if test $withval != yes; then - AC_DEFINE_UNQUOTED(EXECSHELL, "$withval") -diff -Nur mutt-1.3.27.orig/curs_main.c mutt-1.3.27/curs_main.c ---- mutt-1.3.27.orig/curs_main.c Wed Jan 23 00:42:01 2002 -+++ mutt-1.3.27/curs_main.c Fri Feb 1 22:51:32 2002 -@@ -1010,6 +1010,11 @@ + AC_ARG_ENABLE(locales-fix, AS_HELP_STRING([--enable-locales-fix],[The result of isprint() is unreliable]), + [if test x$enableval = xyes; then + AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) +diff -udprP mutt-1.5.19.orig/curs_main.c mutt-1.5.19/curs_main.c +--- mutt-1.5.19.orig/curs_main.c 2009-01-05 21:20:53.000000000 +0200 ++++ mutt-1.5.19/curs_main.c 2009-01-06 19:16:04.000000000 +0200 +@@ -1108,6 +1108,11 @@ int mutt_index_menu (void) { int check; @@ -613,453 +596,398 @@ diff -Nur mutt-1.3.27.orig/curs_main.c mutt-1.3.27/curs_main.c mutt_str_replace (&LastFolder, Context->path); oldcount = Context ? Context->msgcount : 0; -diff -Nur mutt-1.3.27.orig/doc/manual.sgml mutt-1.3.27/doc/manual.sgml ---- mutt-1.3.27.orig/doc/manual.sgml Tue Jan 1 21:18:05 2002 -+++ mutt-1.3.27/doc/manual.sgml Fri Feb 1 22:51:32 2002 -@@ -2318,6 +2318,176 @@ - macro pager \cb |urlview\n - +--- mutt-1.5.20.b/doc/Makefile.am 2009-06-01 04:23:14.000000000 +0200 ++++ mutt-1.5.20/doc/Makefile.am 2009-07-14 12:36:06.000000000 +0200 +@@ -31,7 +31,8 @@ + + CHUNKED_DOCFILES = index.html intro.html gettingstarted.html \ + configuration.html mimesupport.html advancedusage.html \ +- optionalfeatures.html security.html tuning.html reference.html miscellany.html ++ optionalfeatures.html security.html tuning.html reference.html miscellany.html \ ++ compressed-folders.html + + HTML_DOCFILES = manual.html $(CHUNKED_DOCFILES) + +--- mutt-1.5.20.b/doc/Makefile.in 2009-06-09 08:50:43.000000000 +0200 ++++ mutt-1.5.20/doc/Makefile.in 2009-07-14 12:36:53.000000000 +0200 +@@ -235,7 +235,8 @@ + + CHUNKED_DOCFILES = index.html intro.html gettingstarted.html \ + configuration.html mimesupport.html advancedusage.html \ +- optionalfeatures.html security.html tuning.html reference.html miscellany.html ++ optionalfeatures.html security.html tuning.html reference.html miscellany.html \ ++ compressed-folders.html + + HTML_DOCFILES = manual.html $(CHUNKED_DOCFILES) + BUILT_DISTFILES = stamp-doc-xml stamp-doc-chunked manual.txt $(HTML_DOCFILES) +diff -udprP mutt-1.5.19.orig/doc/manual.xml.head mutt-1.5.19/doc/manual.xml.head +--- mutt-1.5.19.orig/doc/manual.xml.head 2009-01-05 21:20:53.000000000 +0200 ++++ mutt-1.5.19/doc/manual.xml.head 2009-01-06 19:35:41.000000000 +0200 +@@ -4639,6 +4639,24 @@ configuration option/command. See + fcc-save-hook + + ++ ++ ++ ++open-hook ++ ++ ++ ++ ++ ++close-hook ++ ++ ++ ++ ++ ++append-hook ++ ++ -+Compressed folders Support (OPTIONAL) -+

+ + +@@ -5138,6 +5156,254 @@ macro pager \cb |urlview\n + + + ++ ++Compressed folders Support (OPTIONAL) + ++ +If Mutt was compiled with compressed folders support (by running the -+configure script with the ++--enable-compressed flag), Mutt can open folders ++stored in an arbitrary format, provided that the user has a script to ++convert from/to this format to one of the accepted. ++ + ++ +The most common use is to open compressed archived folders e.g. with +gzip. ++ + ++ +In addition, the user can provide a script that gets a folder in an +accepted format and appends its context to the folder in the +user-defined format, which may be faster than converting the entire +folder to the accepted format, appending to it and converting back to +the user-defined format. -+ -+There are three hooks defined (, -+ and ) which define commands to uncompress and compress -+a folder and to append messages to an existing compressed folder -+respectively. -+ ++ ++ ++ ++There are three hooks defined ++(open-hook, ++close-hook and ++append-hook) which define commands ++to uncompress and compress a folder and to append messages to an ++existing compressed folder respectively. ++ ++ ++ +For example: + -+ -+open-hook \\.gz$ "gzip -cd %f > %t" -+close-hook \\.gz$ "gzip -c %t > %f" -+append-hook \\.gz$ "gzip -c %t >> %f" -+ -+ -+You do not have to specify all of the commands. If you omit , the folder will be open and -+closed again each time you will add to it. If you omit (or give empty command) , the -+folder will be open in the mode. If you specify though you'll be able to append -+to the folder. -+ ++ ++open-hook \\.gz$ "gzip -cd %f > %t" ++close-hook \\.gz$ "gzip -c %t > %f" ++append-hook \\.gz$ "gzip -c %t >> %f" ++ ++ ++ ++ ++You do not have to specify all of the commands. If you omit ++append-hook, the folder will be open ++and closed again each time you will add to it. If you omit ++close-hook (or give empty command), ++the folder will be open in the mode. If you specify ++append-hook though you'll be able to ++append to the folder. ++ ++ ++ +Note that Mutt will only try to use hooks if the file is not in one of +the accepted formats. In particular, if the file is empty, mutt +supposes it is not compressed. This is important because it allows the +use of programs that do not have well defined extensions. Just use -+&dquot;.&dquot; as a regexp. But this may be surprising if your -+compressing script produces empty files. In this situation, unset , so that the compressed file -+will be removed if you delete all of the messages. -+ -+Open a compressed mailbox for reading

-+Usage: $save_empty, so that ++the compressed file will be removed if you delete all of the messages. ++ ++ ++ ++Open a compressed mailbox for reading ++ ++ ++Usage: open-hook regexp command ++ ++ ++ ++The command is the command that can be used for ++opening the folders whose names match regexp. ++ ++ ++ ++The command string is the printf-like format ++string, and it should accept two parameters: %f, which is ++replaced with the (compressed) folder name, and %t which is ++replaced with the name of the temporary folder to which to write. ++ ++ ++ +%f and %t can be repeated any number of times in the +command string, and all of the entries are replaced with the +appropriate folder name. In addition, %% is replaced by +%, as in printf, and any other %anything is left as is. ++ + -+The ++The command should not ++remove the original compressed file. The command ++should return non-zero exit status if it fails, so mutt knows ++something's wrong. ++ + ++ +Example: + -+ -+open-hook \\.gz$ "gzip -cd %f > %t" -+ -+ -+If the Write a compressed mailbox

-+Usage: command after some changes were made to it. -+ -+The command. Temporary folder -+in this case is the folder previously produced by the command. -+ -+The ++open-hook \\.gz$ "gzip -cd %f > %t" ++ ++ ++ ++ ++If the command is empty, this operation is ++disabled for this file type. ++ ++ ++ ++ ++ ++Write a compressed mailbox ++ ++ ++Usage: close-hook regexp command ++ ++ ++ ++This is used to close the folder that was open with the ++open-hook command after some changes ++were made to it. ++ ++ ++ ++The command string is the command that can be ++used for closing the folders whose names match regexp. ++It has the same format as in the open-hook ++command. Temporary folder in this case is the folder previously ++produced by the open-hook command. ++ ++ ++ ++The command should not ++remove the decompressed file. The command should ++return non-zero exit status if it fails, so mutt knows something's ++wrong. ++ ++ ++ +Example: + -+ -+close-hook \\.gz$ "gzip -c %t > %f" -+ ++ ++close-hook \\.gz$ "gzip -c %t > %f" ++ ++ + -+If the ++If the command is empty, this operation is ++disabled for this file type, and the file can only be open in the ++readonly mode. ++ + -+ is not called when you exit -+from the folder if the folder was not changed. ++ ++close-hook is not called when you ++exit from the folder if the folder was not changed. ++ + -+Append a message to a compressed mailbox

-+Usage: + -+This command is used for saving to an existing compressed folder. -+The command. -+The temporary folder in this case contains the messages that are being -+appended. ++ ++Append a message to a compressed mailbox + -+The ++Usage: append-hook regexp command ++ + ++ ++This command is used for saving to an existing compressed folder. ++The command is the command that can be used for ++appending to the folders whose names match regexp. ++It has the same format as in the open-hook ++command. The temporary folder in this case contains the messages that ++are being appended. ++ ++ ++ ++The command should not ++remove the decompressed file. The command should ++return non-zero exit status if it fails, so mutt knows something's ++wrong. ++ ++ ++ +Example: + -+ -+append-hook \\.gz$ "gzip -c %t >> %f" -+ -+ -+When is used, the folder is -+not opened, which saves time, but this means that we can not find out -+what the folder type is. Thus the default () type is always supposed (i.e. -+this is the format used for the temporary folder). -+ -+If the file does not exist when you save to it, is called, and not . is only -+for appending to existing folders. -+ -+If the and respectively) each time you will add to it. -+ -+Encrypted folders -+

++ ++append-hook \\.gz$ "gzip -c %t >> %f" ++ ++ ++ ++ ++When append-hook is used, the folder ++is not opened, which saves time, but this means that we can not find ++out what the folder type is. Thus the default ++($mbox_type) type is ++always supposed (i.e. this is the format used for the temporary ++folder). ++ ++ ++ ++If the file does not exist when you save to it, ++close-hook is called, and not ++append-hook. ++append-hook is only for appending ++to existing folders. ++ ++ ++ ++If the command is empty, this operation is ++disabled for this file type. In this case, the folder will be open and ++closed again (using open-hook and ++close-hook respectively) each time ++you will add to it. ++ ++ ++ ++ ++ ++Encrypted folders ++ ++ +The compressed folders support can also be used to handle encrypted +folders. If you want to encrypt a folder with PGP, you may want to use +the following hooks: + -+ ++ +open-hook \\.pgp$ "pgp -f < %f > %t" +close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId < %t > %f" -+ ++ ++ + ++ +Please note, that PGP does not support appending to an encrypted +folder, so there is no append-hook defined. ++ + -+If you are using GnuPG instead of PGP, you may use the following hooks -+instead: -+ -+ -+open-hook \\.gpg$ "gpg --decrypt < %f > %t" -+close-hook \\.gpg$ "gpg --encrypt --recipient YourGpgUserIdOrKeyId < %t > %f" -+ -+ -+Mutt's MIME Support -

- Quite a bit of effort has been made to make Mutt the premier text-mode -@@ -2868,12 +3038,16 @@ - - -+ - - - -+ - - - -+ - - - -+Compressed folders Support (OPTIONAL) -+

-+ -+If Mutt was compiled with compressed folders support (by running the -+, -+ and ) which define commands to uncompress and compress -+a folder and to append messages to an existing compressed folder -+respectively. -+ -+For example: -+ -+ -+open-hook \\.gz$ "gzip -cd %f > %t" -+close-hook \\.gz$ "gzip -c %t > %f" -+append-hook \\.gz$ "gzip -c %t >> %f" -+ -+ -+You do not have to specify all of the commands. If you omit , the folder will be open and -+closed again each time you will add to it. If you omit (or give empty command) , the -+folder will be open in the mode. If you specify though you'll be able to append -+to the folder. -+ -+Note that Mutt will only try to use hooks if the file is not in one of -+the accepted formats. In particular, if the file is empty, mutt -+supposes it is not compressed. This is important because it allows the -+use of programs that do not have well defined extensions. Just use -+&dquot;.&dquot; as a regexp. But this may be surprising if your -+compressing script produces empty files. In this situation, unset , so that the compressed file -+will be removed if you delete all of the messages. -+ -+Open a compressed mailbox for reading

-+Usage: ++Note: the folder is temporary stored ++decrypted in the /tmp directory, where it can be read by your system ++administrator. So think about the security aspects of this. ++ + -+The + -+%f and %t can be repeated any number of times in the -+command string, and all of the entries are replaced with the -+appropriate folder name. In addition, %% is replaced by -+%, as in printf, and any other %anything is left as is. -+ -+The -+open-hook \\.gz$ "gzip -cd %f > %t" -+ -+ -+If the Write a compressed mailbox

-+Usage: command after some changes were made to it. -+ -+The command. Temporary folder -+in this case is the folder previously produced by the command. -+ -+The -+close-hook \\.gz$ "gzip -c %t > %f" -+ -+ -+If the is not called when you exit -+from the folder if the folder was not changed. -+ -+Append a message to a compressed mailbox

-+Usage: command. -+The temporary folder in this case contains the messages that are being -+appended. -+ -+The + -+ -+append-hook \\.gz$ "gzip -c %t >> %f" -+ -+ -+When is used, the folder is -+not opened, which saves time, but this means that we can not find out -+what the folder type is. Thus the default () type is always supposed (i.e. -+this is the format used for the temporary folder). -+ -+If the file does not exist when you save to it, is called, and not . is only -+for appending to existing folders. -+ -+If the and respectively) each time you will add to it. -+ -+Encrypted folders -+

-+The compressed folders support can also be used to handle encrypted -+folders. If you want to encrypt a folder with PGP, you may want to use -+the following hooks: -+ -+ -+open-hook \\.pgp$ "pgp -f < %f > %t" -+close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId < %t > %f" -+ -+ -+Please note, that PGP does not support appending to an encrypted -+folder, so there is no append-hook defined. + + Mutt's MIME Support + +@@ -6942,6 +7208,18 @@ The following are the commands understoo + + + ++append-hook ++ ++pattern ++ ++ ++command ++ ++ ++ ++ ++ ++ + auto_view + + mimetype +@@ -7007,6 +7285,18 @@ The following are the commands understoo + + + ++close-hook ++ ++pattern ++ ++ ++command ++ ++ ++ ++ ++ ++ + color + + object +@@ -7421,6 +7711,18 @@ The following are the commands understoo + + + ++open-hook ++ ++pattern ++ ++ ++command ++ ++ ++ ++ ++ ++ + crypt-hook + + pattern +diff -udprP mutt-1.5.19.orig/doc/Muttrc.head mutt-1.5.19/doc/Muttrc.head +--- mutt-1.5.19.orig/doc/Muttrc.head 2008-06-14 03:08:43.000000000 +0300 ++++ mutt-1.5.19/doc/Muttrc.head 2009-01-06 19:16:04.000000000 +0200 +@@ -29,6 +29,17 @@ macro generic,pager " + macro index,pager y "?" "show incoming mailboxes list" + bind browser y exit + ++# Use folders which match on \\.gz$ as gzipped folders: ++open-hook \\.gz$ "gzip -cd %f > %t" ++close-hook \\.gz$ "gzip -c %t > %f" ++append-hook \\.gz$ "gzip -c %t >> %f" ++open-hook \\.bz2$ "bzip2 -cd %f > %t" ++close-hook \\.bz2$ "bzip2 -c %t > %f" ++append-hook \\.bz2$ "bzip2 -c %t >> %f" ++open-hook \\.xz$ "xz -cd %f > %t" ++close-hook \\.xz$ "xz -c %t > %f" ++append-hook \\.xz$ "xz -c %t >> %f" + -+If you are using GnuPG instead of PGP, you may use the following hooks -+instead: -+ -+ -+open-hook \\.gpg$ "gpg --decrypt < %f > %t" -+close-hook \\.gpg$ "gpg --encrypt --recipient YourGpgUserIdOrKeyId < %t > %f" -+ -+ -+Mutt's MIME Support -

- Quite a bit of effort has been made to make Mutt the premier text-mode -@@ -2869,12 +3039,16 @@ - - -+ - - - -+ - - - -+ - - #include #include -@@ -87,6 +91,16 @@ +@@ -92,6 +96,16 @@ int mutt_parse_hook (BUFFER *buf, BUFFER memset (&pattern, 0, sizeof (pattern)); pattern.data = safe_strdup (path); } @@ -1104,18 +1032,18 @@ diff -Nur mutt-1.3.27.orig/hook.c mutt-1.3.27/hook.c + { + if (mutt_test_compress_command (command.data)) + { -+ strfcpy (err->data, _("bad formatted command string"), err->dsize); -+ return (-1); ++ strfcpy (err->data, _("bad formatted command string"), err->dsize); ++ return (-1); + } + } +#endif - else if (DefaultHook && (data & (M_FOLDERHOOK | M_MBOXHOOK | M_SENDHOOK | - M_FCCHOOK | M_SAVEHOOK | M_MESSAGEHOOK))) - { -diff -Nur mutt-1.3.27.orig/init.h mutt-1.3.27/init.h ---- mutt-1.3.27.orig/init.h Mon Dec 10 11:09:03 2001 -+++ mutt-1.3.27/init.h Fri Feb 1 22:51:32 2002 -@@ -2447,6 +2447,11 @@ + else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ICONVHOOK | M_ACCOUNTHOOK)) + && (!WithCrypto || !(data & M_CRYPTHOOK)) + ) +diff -udprP mutt-1.5.19.orig/init.h mutt-1.5.19/init.h +--- mutt-1.5.19.orig/init.h 2009-01-05 21:20:53.000000000 +0200 ++++ mutt-1.5.19/init.h 2009-01-06 19:16:04.000000000 +0200 +@@ -3398,6 +3398,11 @@ struct command_t Commands[] = { { "fcc-hook", mutt_parse_hook, M_FCCHOOK }, { "fcc-save-hook", mutt_parse_hook, M_FCCHOOK | M_SAVEHOOK }, { "folder-hook", mutt_parse_hook, M_FOLDERHOOK }, @@ -1124,31 +1052,64 @@ diff -Nur mutt-1.3.27.orig/init.h mutt-1.3.27/init.h + { "close-hook", mutt_parse_hook, M_CLOSEHOOK }, + { "append-hook", mutt_parse_hook, M_APPENDHOOK }, +#endif + { "group", parse_group, M_GROUP }, + { "ungroup", parse_ungroup, M_UNGROUP }, { "hdr_order", parse_list, UL &HeaderOrderList }, - { "iconv-hook", mutt_parse_hook, M_ICONVHOOK }, - { "ignore", parse_ignore, 0 }, -diff -Nur mutt-1.3.27.orig/main.c mutt-1.3.27/main.c ---- mutt-1.3.27.orig/main.c Wed Nov 7 11:40:26 2001 -+++ mutt-1.3.27/main.c Fri Feb 1 22:51:32 2002 -@@ -328,6 +328,12 @@ - #else - "-LOCALES_HACK " +diff -udprP mutt-1.5.19.orig/main.c mutt-1.5.19/main.c +--- mutt-1.5.19.orig/main.c 2009-01-04 01:27:10.000000000 +0200 ++++ mutt-1.5.19/main.c 2009-01-06 19:16:04.000000000 +0200 +@@ -311,6 +311,12 @@ static void show_version (void) + "-USE_GNU_REGEX " #endif -+ + +#ifdef USE_COMPRESSED + "+COMPRESSED " +#else + "-COMPRESSED " +#endif - - #ifdef HAVE_WC_FUNCS - "+HAVE_WC_FUNCS " -diff -Nur mutt-1.3.27.orig/mbox.c mutt-1.3.27/mbox.c ---- mutt-1.3.27.orig/mbox.c Wed Oct 31 10:40:05 2001 -+++ mutt-1.3.27/mbox.c Fri Feb 1 22:51:32 2002 -@@ -28,6 +28,10 @@ - #include "sort.h" ++ + "\n" + + #ifdef HAVE_COLOR +diff -udprP mutt-1.5.19.orig/Makefile.am mutt-1.5.19/Makefile.am +--- mutt-1.5.19.orig/Makefile.am 2009-01-05 21:20:53.000000000 +0200 ++++ mutt-1.5.19/Makefile.am 2009-01-06 19:16:04.000000000 +0200 +@@ -18,6 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist. + bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ + mutt_SOURCES = \ + addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ ++ compress.c \ + crypt.c cryptglue.c \ + commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \ + edit.c enter.c flags.c init.c filter.c from.c \ +@@ -58,6 +59,7 @@ EXTRA_mutt_SOURCES = account.c bcache.c + + EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ + configure account.h \ ++ compress.h \ + attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \ + globals.h hash.h history.h init.h keymap.h mutt_crypt.h \ + mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \ +diff -udprP mutt-1.5.19.orig/Makefile.in mutt-1.5.19/Makefile.in +--- mutt-1.5.19.orig/Makefile.in 2009-01-05 21:24:13.000000000 +0200 ++++ mutt-1.5.19/Makefile.in 2009-01-06 19:16:04.000000000 +0200 +@@ -14,6 +14,10 @@ + + @SET_MAKE@ + ++mutt_SOURCES += compress.c ++EXTRA_DIST += compress.h ++mutt_OBJECTS += compress.o ++ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +diff -udprP mutt-1.5.19.orig/mbox.c mutt-1.5.19/mbox.c +--- mutt-1.5.19.orig/mbox.c 2008-08-15 21:30:12.000000000 +0300 ++++ mutt-1.5.19/mbox.c 2009-01-06 19:16:04.000000000 +0200 +@@ -29,6 +29,10 @@ #include "copy.h" + #include "mutt_curses.h" +#ifdef USE_COMPRESSED +#include "compress.h" @@ -1157,7 +1118,7 @@ diff -Nur mutt-1.3.27.orig/mbox.c mutt-1.3.27/mbox.c #include #include #include -@@ -1045,6 +1049,12 @@ +@@ -1038,6 +1042,12 @@ bail: /* Come here in case of disaster int mbox_close_mailbox (CONTEXT *ctx) { mx_unlock_file (ctx->path, fileno (ctx->fp), 1); @@ -1170,37 +1131,37 @@ diff -Nur mutt-1.3.27.orig/mbox.c mutt-1.3.27/mbox.c mutt_unblock_signals (); mx_fastclose_mailbox (ctx); return 0; -diff -Nur mutt-1.3.27.orig/mutt.h mutt-1.3.27/mutt.h ---- mutt-1.3.27.orig/mutt.h Wed Jan 23 00:42:01 2002 -+++ mutt-1.3.27/mutt.h Fri Feb 1 22:51:32 2002 -@@ -143,6 +143,11 @@ - #define M_PGPHOOK (1<<8) - #endif +diff -udprP mutt-1.5.19.orig/mutt.h mutt-1.5.19/mutt.h +--- mutt-1.5.19.orig/mutt.h 2008-09-26 01:00:03.000000000 +0300 ++++ mutt-1.5.19/mutt.h 2009-01-06 19:16:04.000000000 +0200 +@@ -140,6 +140,11 @@ typedef enum #define M_ACCOUNTHOOK (1<<9) + #define M_REPLYHOOK (1<<10) + #define M_SEND2HOOK (1<<11) +#ifdef USE_COMPRESSED -+#define M_OPENHOOK (1<<10) -+#define M_APPENDHOOK (1<<11) -+#define M_CLOSEHOOK (1<<12) ++#define M_OPENHOOK (1<<12) ++#define M_APPENDHOOK (1<<13) ++#define M_CLOSEHOOK (1<<14) +#endif /* tree characters for linearize_tree and print_enriched_string */ #define M_TREE_LLCORNER 1 -@@ -745,6 +750,11 @@ - void *data; /* driver specific data */ - #endif /* USE_IMAP */ +@@ -869,6 +874,11 @@ typedef struct _context + + unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */ +#ifdef USE_COMPRESSED + void *compressinfo; /* compressed mbox module private data */ + char *realpath; /* path to compressed mailbox */ +#endif /* USE_COMPRESSED */ + - short magic; /* mailbox type */ - unsigned int locked : 1; /* is the mailbox locked? */ -diff -Nur mutt-1.3.27.orig/mx.c mutt-1.3.27/mx.c ---- mutt-1.3.27.orig/mx.c Wed Jan 23 00:42:01 2002 -+++ mutt-1.3.27/mx.c Fri Feb 1 22:51:32 2002 -@@ -26,6 +26,10 @@ + unsigned int changed : 1; /* mailbox has been modified */ + unsigned int readonly : 1; /* don't allow changes to the mailbox */ +diff -udprP mutt-1.5.19.orig/mx.c mutt-1.5.19/mx.c +--- mutt-1.5.19.orig/mx.c 2009-01-05 21:20:53.000000000 +0200 ++++ mutt-1.5.19/mx.c 2009-01-06 19:16:04.000000000 +0200 +@@ -30,6 +30,10 @@ #include "keymap.h" #include "url.h" @@ -1208,10 +1169,10 @@ diff -Nur mutt-1.3.27.orig/mx.c mutt-1.3.27/mx.c +#include "compress.h" +#endif + - #ifdef HAVE_PGP - #include "pgp.h" + #ifdef USE_IMAP + #include "imap.h" #endif -@@ -448,6 +452,10 @@ +@@ -445,6 +449,11 @@ int mx_get_magic (const char *path) return (-1); } @@ -1219,10 +1180,11 @@ diff -Nur mutt-1.3.27.orig/mx.c mutt-1.3.27/mx.c + if (magic == 0 && mutt_can_read_compressed (path)) + return M_COMPRESSED; +#endif ++ return (magic); } -@@ -489,6 +497,13 @@ +@@ -484,6 +493,13 @@ static int mx_open_mailbox_append (CONTE { struct stat sb; @@ -1236,12 +1198,10 @@ diff -Nur mutt-1.3.27.orig/mx.c mutt-1.3.27/mx.c ctx->append = 1; #ifdef USE_IMAP -@@ -649,7 +664,12 @@ - } +@@ -648,6 +664,11 @@ CONTEXT *mx_open_mailbox (const char *pa ctx->magic = mx_get_magic (path); -- -+ + +#ifdef USE_COMPRESSED + if (ctx->magic == M_COMPRESSED) + mutt_open_read_compressed (ctx); @@ -1250,21 +1210,21 @@ diff -Nur mutt-1.3.27.orig/mx.c mutt-1.3.27/mx.c if(ctx->magic == 0) mutt_error (_("%s is not a mailbox."), path); -@@ -755,6 +775,10 @@ +@@ -748,6 +769,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx) mutt_free_header (&ctx->hdrs[i]); - safe_free ((void **) &ctx->hdrs); - safe_free ((void **) &ctx->v2r); + FREE (&ctx->hdrs); + FREE (&ctx->v2r); +#ifdef USE_COMPRESSED + if (ctx->compressinfo) + mutt_fast_close_compressed (ctx); +#endif - safe_free ((void **) &ctx->path); - safe_free ((void **) &ctx->pattern); + FREE (&ctx->path); + FREE (&ctx->pattern); if (ctx->limit_pattern) -@@ -812,6 +836,12 @@ +@@ -800,6 +825,12 @@ static int sync_mailbox (CONTEXT *ctx, i + if (tmp && tmp->new == 0) mutt_update_mailbox (tmp); - #endif + +#ifdef USE_COMPRESSED + if (rc == 0 && ctx->compressinfo) @@ -1274,7 +1234,7 @@ diff -Nur mutt-1.3.27.orig/mx.c mutt-1.3.27/mx.c return rc; } -@@ -1018,6 +1048,11 @@ +@@ -1001,6 +1032,11 @@ int mx_close_mailbox (CONTEXT *ctx, int !mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY)) mx_unlink_empty (ctx->path); @@ -1286,7 +1246,7 @@ diff -Nur mutt-1.3.27.orig/mx.c mutt-1.3.27/mx.c mx_fastclose_mailbox (ctx); return 0; -@@ -1325,6 +1360,11 @@ +@@ -1310,6 +1346,11 @@ int mx_check_mailbox (CONTEXT *ctx, int { int rc; @@ -1298,116 +1258,39 @@ diff -Nur mutt-1.3.27.orig/mx.c mutt-1.3.27/mx.c if (ctx) { if (ctx->locked) lock = 0; -diff -Nur mutt-1.3.27.orig/mx.h mutt-1.3.27/mx.h ---- mutt-1.3.27.orig/mx.h Wed Oct 31 10:40:05 2001 -+++ mutt-1.3.27/mx.h Fri Feb 1 22:51:32 2002 -@@ -41,6 +41,9 @@ - #ifdef USE_POP - , M_POP - #endif +diff -udprP mutt-1.5.19.orig/mx.h mutt-1.5.19/mx.h +--- mutt-1.5.19.orig/mx.h 2008-03-19 22:07:06.000000000 +0200 ++++ mutt-1.5.19/mx.h 2009-01-06 19:16:04.000000000 +0200 +@@ -40,6 +40,9 @@ enum + M_MAILDIR, + M_IMAP, + M_POP +#ifdef USE_COMPRESSED + , M_COMPRESSED +#endif }; WHERE short DefaultMagic INITVAL (M_MBOX); -diff -Nur mutt-1.3.27.orig/po/POTFILES.in mutt-1.3.27/po/POTFILES.in ---- mutt-1.3.27.orig/po/POTFILES.in Tue Oct 10 21:18:37 2000 -+++ mutt-1.3.27/po/POTFILES.in Fri Feb 1 22:51:32 2002 -@@ -8,6 +8,7 @@ +diff -udprP mutt-1.5.19.orig/PATCHES mutt-1.5.19/PATCHES +--- mutt-1.5.19.orig/PATCHES 2008-03-19 22:07:06.000000000 +0200 ++++ mutt-1.5.19/PATCHES 2009-01-06 19:16:04.000000000 +0200 +@@ -0,0 +1 @@ ++rr.compressed +diff -udprP mutt-1.5.19.orig/po/POTFILES.in mutt-1.5.19/po/POTFILES.in +--- mutt-1.5.19.orig/po/POTFILES.in 2008-03-19 22:07:57.000000000 +0200 ++++ mutt-1.5.19/po/POTFILES.in 2009-01-06 19:16:04.000000000 +0200 +@@ -8,6 +8,7 @@ charset.c color.c commands.c compose.c +compress.c - curs_lib.c - curs_main.c - edit.c -diff -Nur mutt-1.3.27.orig/po/de.po mutt-1.3.27/po/de.po ---- mutt-1.3.27.orig/po/de.po Wed Jan 23 00:43:05 2002 -+++ mutt-1.3.27/po/de.po Fri Feb 1 22:51:32 2002 -@@ -654,6 +654,48 @@ - msgid "Message written." - msgstr "Nachricht geschrieben." - -+#: compress.c:203 mbox.c:661 -+msgid "Mailbox was corrupted!" -+msgstr "Mailbox wurde zerstört!" -+ -+#: compress.c:228 compress.c:253 -+#, c-format -+msgid "Decompressing %s...\n" -+msgstr "Entpacke %s...\n" -+ -+#: compress.c:246 compress.c:367 compress.c:443 mbox.c:706 -+msgid "Unable to lock mailbox!" -+msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!" -+ -+#: compress.c:264 -+#, c-format -+msgid "Error executing: %s : unable to open the mailbox!\n" -+msgstr "Fehler beim Ausführen von %s : Kann die Mailbox nicht öffnen!\n" -+ -+#: compress.c:350 compress.c:377 compress.c:423 compress.c:454 -+#, c-format -+msgid "Compressing %s...\n" -+msgstr "Komprimiere %s...\n" -+ -+#: compress.c:381 -+#, c-format -+msgid "" -+"%s: Error compressing mailbox! Original mailbox deleted, uncompressed one " -+"kept!\n" -+msgstr "" -+"%s: Fehler beim Komprimieren der Mailbox! Ursprüngliche Mailbox gelöscht, " -+"entpackte gespeichert!\n" -+ -+#: compress.c:425 compress.c:456 -+#, c-format -+msgid "Compressed-appending to %s...\n" -+msgstr "Hänge komprimiert an %s... an\n" -+ -+#: compress.c:461 -+#, c-format -+msgid " %s: Error compressing mailbox! Uncompressed one kept!\n" -+msgstr " %s: Fehler beim packen der Mailbox! Entpackte Mailbox gespeichert!\n" -+ - #: curs_lib.c:153 - msgid "yes" - msgstr "ja" -@@ -1137,6 +1179,10 @@ - msgid "Help for %s" - msgstr "Hilfe für %s" - -+#: hook.c:96 -+msgid "bad formatted command string" -+msgstr "Hook enthält nicht die Muster %f und %t" -+ - #: hook.c:240 - msgid "unhook: Can't do unhook * from within a hook." - msgstr "unhook: Innerhalb eines hook kann kein unhook * aufgerufen werden." -@@ -2459,18 +2505,10 @@ - msgid "Mailbox is corrupt!" - msgstr "Mailbox fehlerhaft!" - --#: mbox.c:665 --msgid "Mailbox was corrupted!" --msgstr "Mailbox wurde zerstört!" -- - #: mbox.c:702 mbox.c:978 - msgid "Fatal error! Could not reopen mailbox!" - msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!" - --#: mbox.c:711 --msgid "Unable to lock mailbox!" --msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!" -- - #. this means ctx->changed or ctx->deleted was set, but no - #. * messages were found to be changed or deleted. This should - #. * never happen, is we presume it is a bug in mutt. -diff -Nur mutt-1.3.27.orig/status.c mutt-1.3.27/status.c ---- mutt-1.3.27.orig/status.c Fri Mar 3 11:10:14 2000 -+++ mutt-1.3.27/status.c Fri Feb 1 22:51:32 2002 -@@ -93,6 +93,14 @@ + crypt-gpgme.c + crypt.c + cryptglue.c +diff -udprP mutt-1.5.19.orig/status.c mutt-1.5.19/status.c +--- mutt-1.5.19.orig/status.c 2009-01-05 21:20:53.000000000 +0200 ++++ mutt-1.5.19/status.c 2009-01-06 19:16:04.000000000 +0200 +@@ -96,6 +96,14 @@ status_format_str (char *buf, size_t buf case 'f': snprintf (fmt, sizeof(fmt), "%%%ss", prefix); @@ -1415,7 +1298,7 @@ diff -Nur mutt-1.3.27.orig/status.c mutt-1.3.27/status.c + if (Context && Context->compressinfo && Context->realpath) + { + strfcpy (tmp, Context->realpath, sizeof (tmp)); -+ mutt_pretty_mailbox (tmp); ++ mutt_pretty_mailbox (tmp, sizeof (tmp)); + } + else +#endif