Attachment #43759 for bug #67872

View | Details | Raw Unified | Return to bug 67872
Collapse All | Expand All





PORTNAME=	mutt-devel
PORTVERSION=	1.5.6
PORTREVISION=	3
CATEGORIES+=	mail ipv6
.if defined(WITH_MUTT_NNTP)
CATEGORIES+=	news

.endif

USE_REINPLACE=	yes
USE_AUTOMAKE_VER=	18
USE_AUTOCONF_VER=	259
USE_OPENSSL=	yes

PLIST=		${WRKDIR}/PLIST

WITH_MUTT_NCURSES=	yes
.endif
.if defined(WITH_MUTT_NCURSES)
MUTT_USES_NCURSES=	yes
.endif
.if defined(WITH_MUTT_SLANG) && !defined(MUTT_USES_NCURSES)
MUTT_USES_SLANG=	yes
.endif
.if !defined(MUTT_USES_NCURSES) && !defined(WITHOUT_MUTT_NCURSES) && !defined(MUTT_USES_SLANG)
MUTT_USES_NCURSES=	yes
.endif
.if defined(WITHOUT_MUTT_SGMLFORMAT)
SGML_USED=	no

.if defined(NOPORTDOCS)
SGML_USED=	no
.endif
.if defined(MUTT_USES_NCURSES) && ${OSVERSION} < 400000
LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
CFLAGS+=	-I${PREFIX}/include/ncurses -I${PREFIX}/include
.elif defined(MUTT_USES_SLANG)
LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
.endif
.if defined(WITH_MUTT_CYRUS_SASL)

LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
.endif
.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
LIB_DEPENDS+=	db-4.2.2:${PORTSDIR}/databases/db42
CFLAGS+=	-I${PREFIX}/include/db42
.endif
.if ! defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT)
pre-configure::

.if defined(WITH_MUTT_LOCALES_FIX)
CONFIGURE_ARGS+=	--enable-locales-fix
.endif
.if defined(MUTT_USES_NCURSES) && ${OSVERSION} < 400000
CONFIGURE_ARGS+=	--with-curses=${PREFIX}
.elif defined(MUTT_USES_SLANG)
CONFIGURE_ARGS+=	--with-slang=${PREFIX}
PATCHFILES+=	patch-${VVV_PATCH_VERSION}.vvv.slang.gz:vvv
.endif

.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=	--disable-nls
.endif
.if defined(WITHOUT_MUTT_ICONV)
CONFIGURE_ARGS+=	--disable-iconv
.else
CONFIGURE_ARGS+=	--with-libiconv-prefix=${PREFIX}

	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
.endif
.endif
.if defined(MUTT_USES_SLANG)
	@${ECHO} "====================================================" >> ${PKGMESSAGE}
	@${ECHO} "You have installed ${PORTNAME} with SLANG support." >> ${PKGMESSAGE}
	@${ECHO} "This may work for a color terminal only when defining" >> ${PKGMESSAGE}

Lines 871-873 Link Here

(-)./files/extra-patch-imap-header-cache (+4 lines)
871	+	871	+
872	+#endif	872	+#endif
873	+	873	+
		874	--- PATCHES.orig Tue Nov 6 19:59:33 2001
		875	+++ PATCHES Tue Nov 6 19:59:42 2001
		876	@@ -1,0 +1 @@
		877	+imap-header-cache.1




+	hcache.c \
 	addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
diff -Nru a/configure.in b/configure.in
--- configure.in.orig	Sat Jun 12 09:49:17 2004
+++ configure.in	Sat Jun 12 09:50:18 2004
@@ -773,6 +773,80 @@
 
         fi])
 
+dnl -- start cache --
+AC_ARG_ENABLE(hcache, [  --enable-hcache            Enable header caching for Maildir folders],
+[if test x$enableval = xyes; then
+    AC_DEFINE(USE_HCACHE, 1, [Enable header caching for Maildir style mailboxes])
+
+    OLDCPPFLAGS="$CPPFLAGS"
+    OLDLIBS="$LIBS"
+
+    BDB_VERSIONS="db-4 db4 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db"
+
+    AC_MSG_CHECKING([for BerkeleyDB > 4.0])
+
+    for d in /opt/csw/bdb4 /opt /usr/local /usr; do
+        for v in `echo $BDB_VERSIONS .`; do
+            if test -r "$d/include/$v/db.h"; then
+                BDB_INCLUDE_DIR="$d/include/$v"
+                break
+            fi
+        done
+        for v in `echo $BDB_VERSIONS .`; do
+            if test -d "$d/lib/$v"; then
+                BDB_LIB_DIR="$d/lib/$v"
+                break
+            fi
+        done
+        for v in BerkeleyDB.4.3 BerkeleyDB.4.2 BerkeleyDB.4.1; do
+            test -r "$d/$v/include/db.h" && BDB_INCLUDE_DIR="$d/$v/include"
+            test -d "$d/$v/lib" && BDB_LIB_DIR="$d/$v/lib"
+        done
+        test x$BDB_INCLUDE_DIR = x -o x$BDB_LIB_DIR = x && continue
+        for v in `echo $BDB_VERSIONS`; do
+            CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR"
+            LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$v"
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+                #include <stdlib.h>
+                #include <db.h>
+            ]],[[
+                DB *db = NULL;
+                db->open(db,NULL,NULL,NULL,0,0,0);
+            ]])],[
+                ac_cv_dbcreate=yes
+                BDB_LIB="$v"
+                break
+            ])
+        done
+        test x$BDB_LIB != x && break
+    done
+
+    if test x$ac_cv_dbcreate = xyes; then
+        AC_MSG_RESULT(yes)
+    else
+        AC_MSG_RESULT(no)
+    fi
+
+    CPPFLAGS="$OLDCPPFLAGS"
+    LIBS="$OLDLIBS -lgdbm";
+    AC_CACHE_CHECK(for gdbm_open, ac_cv_gdbmopen,
+        [ac_cv_gdbmopen=no
+        AC_TRY_LINK([#include <gdbm.h>],[gdbm_open(0,0,0,0,0);],[ac_cv_gdbmopen=yes])])
+
+    if test x$ac_cv_dbcreate = xyes; then
+        CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR"
+        LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$BDB_LIB"
+        AC_DEFINE(HAVE_DB4, 1, [Sleepycat DB4 Support])
+    elif test x$ac_cv_gdbmopen = xyes; then
+        CPPFLAGS="$OLDCPPFLAGS"
+        LIBS="$OLDLIBS -lgdbm";
+        AC_DEFINE(HAVE_GDBM, 1, [GDBM Support])
+    else
+        AC_MSG_ERROR(You need Sleepycat DB4 or GDBM for --enable-hcache)
+    fi
+fi])
+dnl -- end cache --
+

 AC_SUBST(MUTT_LIB_OBJECTS)
 AC_SUBST(LIBIMAP)
diff -Nru a/globals.h b/globals.h
--- globals.h	2004-06-10 14:03:44 +02:00
+++ globals.h	2004-06-10 14:03:44 +02:00
@@ -63,6 +63,10 @@
 WHERE char *Locale;
 WHERE char *MailcapPath;
 WHERE char *Maildir;
+#if USE_HCACHE
+WHERE char *MaildirCache;
+WHERE short MaildirCachePageSize;
+#endif
 WHERE char *MhFlagged;
 WHERE char *MhReplied;
 WHERE char *MhUnseen;
diff -Nru a/hcache.c b/hcache.c
--- hcache.c.orig	Sat Jun 12 09:52:31 2004
+++ hcache.c	Sat Jun 12 09:52:56 2004
@@ -0,0 +1,676 @@
+/*
+ * Copyright (C) 2004 Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
+ * Copyright (C) 2004 Brian Fundakowski Feldman <green@FreeBSD.org>
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by

+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#if HAVE_GDBM
+#include <gdbm.h>
+#elif HAVE_DB4
+#include <db42/db.h>
+#endif
+
+#include <errno.h>
+#include <fcntl.h>
+#include "mutt.h"
+#include "mime.h"

+#include "lib.h"
+
+static unsigned char *
+dump_int(unsigned int i, unsigned char *d, int *off)
+{
+	safe_realloc(&d, *off + sizeof(int));
+	memcpy(d + *off, &i, sizeof(int));

+}
+
+static void
+restore_int(unsigned int *i, const unsigned char *d, int *off)
+{
+	memcpy(i, d + *off, sizeof(int));
+	(*off) += sizeof(int);
+}
+
+static unsigned char *
+dump_char(char *c, unsigned char *d, int *off)
+{
+	unsigned int size;
+

+}
+
+static void
+restore_char(char **c, const unsigned char *d, int *off)
+{
+	unsigned int size;
+	restore_int(&size, d, off);

+}
+
+static void
+skip_char(const unsigned char *d, int *off)
+{
+	unsigned int size;
+	restore_int(&size, d, off);

+}
+
+static unsigned char *
+dump_address(ADDRESS *a, unsigned char *d, int *off)
+{
+	unsigned int counter = 0;
+	unsigned int start_off = *off;
+
+	d = dump_int(0xdeadbeef, d, off);
+
+	while (a) {
+#ifdef EXACT_ADDRESS

+}
+
+static void
+restore_address(ADDRESS **a, const unsigned char *d, int *off)
+{
+	unsigned int counter;
+

+}
+
+static unsigned char *
+dump_list(LIST *l, unsigned char *d, int *off)
+{
+	unsigned int counter = 0;
+	unsigned int start_off = *off;
+
+	d = dump_int(0xdeadbeef, d, off);
+
+	while (l) {
+		d = dump_char(l->data, d, off);

+}
+
+static void
+restore_list(LIST **l, const unsigned char *d, int *off)
+{
+	unsigned int counter;
+

+}
+
+static unsigned char *
+dump_parameter(PARAMETER *p, unsigned char *d, int *off)
+{
+	unsigned int counter = 0;
+	unsigned int start_off = *off;
+
+	d = dump_int(0xdeadbeef, d, off);
+
+	while (p) {
+		d = dump_char(p->attribute, d, off);

+}
+
+static void
+restore_parameter(PARAMETER **p, const unsigned char *d, int *off)
+{
+	unsigned int counter;
+

+}
+
+static unsigned char *
+dump_body(BODY *c, unsigned char *d, int *off)
+{
+	safe_realloc(&d, *off + sizeof(BODY));
+	memcpy(d + *off, c, sizeof(BODY));

+}
+
+static void
+restore_body(BODY *c, const unsigned char *d, int *off)
+{
+	memcpy(c, d + *off, sizeof(BODY));
+	*off += sizeof(BODY);

+}
+
+static unsigned char *
+dump_envelope(ENVELOPE *e, unsigned char *d, int *off)
+{
+	d = dump_address(e->return_path, d, off);
+	d = dump_address(e->from, d, off);

+	d = dump_address(e->mail_followup_to, d, off);
+
+	d = dump_char(e->subject, d, off);
+	if (e->real_subj) {
+		d = dump_int(e->real_subj - e->subject, d, off);
+	} else {
+		d = dump_int(-1, d, off);
+	}
+	d = dump_char(e->message_id, d, off);
+	d = dump_char(e->supersedes, d, off);
+	d = dump_char(e->date, d, off);

+}
+
+static void
+restore_envelope(ENVELOPE *e, const unsigned char *d, int *off)
+{
+	int real_subj_off;
+
+	restore_address(& e->return_path, d, off);
+	restore_address(& e->from, d, off);
+	restore_address(& e->to, d, off);

+	restore_address(& e->mail_followup_to, d, off);
+
+	restore_char(& e->subject, d, off);
+	restore_int(& real_subj_off, d, off);
+	if (0 <= real_subj_off) {
+		e->real_subj = e->subject + real_subj_off;
+	} else {
+		e->real_subj = NULL;
+	}
+	restore_char(& e->message_id, d, off);
+	restore_char(& e->supersedes, d, off);
+	restore_char(& e->date, d, off);

+
+#if HAVE_LANGINFO_CODESET
+int
+mutt_hcache_charset_matches(const char *d)
+{
+	int matches;
+	int off = sizeof(struct timeval);
+	char *charset = NULL;
+
+	restore_char(&charset, (unsigned char *) d, &off);
+	matches = (0 == mutt_strcmp(charset, Charset));
+	FREE(&charset);
+
+	return (matches);
+}
+#endif /* HAVE_LANGINFO_CODESET */
+
+static void *
+mutt_hcache_dump(HEADER *h, int *off)
+{
+	unsigned char *d = NULL;
+	struct timeval now;

+}
+
+HEADER *
+mutt_hcache_restore(const unsigned char *d, HEADER **oh)
+{
+	int off = 0;
+	HEADER *h        = mutt_new_header();
+
+	/* skip timeval */

+	return h;
+}
+
+static size_t mutt_hcache_keylen (const char *fn)
+mutt_hcache_open(char *path)
+{
+  const char * p = strchr (fn, ':');
+  return p ? (size_t) (p - fn) : strlen (fn);
+}
+
+#if HAVE_GDBM
+static struct
+header_cache
+{
+	GDBM_FILE db;
+	char *folder;
+} HEADER_CACHE;
+
+void *
+mutt_hcache_open(const char *path, const char *folder)
+{
+	struct header_cache *h = malloc(sizeof(HEADER_CACHE));
+	h->db     = NULL;
+        h->folder = safe_strdup (folder);
+
+	if (! path || path[0] == '\0') {
+		return NULL;
+	}
+
+	h->db = gdbm_open((char *) path, (int) MaildirCachePageSize, GDBM_WRCREAT, 00600, NULL);
+	if (h->db) {
+		return h;
+	}
+
+	/* if rw failed try ro */
+	h->db = gdbm_open((char *) path, (int) MaildirCachePageSize, GDBM_READER, 00600, NULL);
+	if(h->db) {
+		return h;
+	} else {
+		FREE(& h->folder);
+		FREE(& h);
+
+		return NULL;
+	}
+}
+
+void
+mutt_hcache_close(void *db)
+{
+	struct header_cache *h = db;
+
+	if (! h) {
+		return;
+	}
+
+	gdbm_close(h->db);
+	FREE(& h->folder);
+	FREE(& h);
+}
+
+void *
+mutt_hcache_fetch(void *db, const char *filename)
+{
+	struct header_cache *h = db;
+	datum key;
+	datum data;
+	char path[_POSIX_PATH_MAX];
+
+	if (! h) {
+		return NULL;
+	}
+
+	strncpy(path, h->folder, sizeof(path));
+	strncat(path, filename, sizeof(path) - strlen(path));
+
+	key.dptr  = path;
+	key.dsize = mutt_hcache_keylen(path);
+
+	data = gdbm_fetch(h->db, key);
+
+	return data.dptr;
+}
+
+int
+mutt_hcache_store(void *db, const char *filename, HEADER *header)
+{
+	struct header_cache *h = db;
+	datum key;
+	datum data;
+	char path[_POSIX_PATH_MAX];
+	int ret;
+
+	if (! h) {
+		return -1;
+	}
+
+	strncpy(path, h->folder, sizeof(path));
+	strncat(path, filename, sizeof(path) - strlen(path));
+
+	key.dptr  = path;
+	key.dsize = mutt_hcache_keylen(path);
+
+	data.dptr = mutt_hcache_dump(header, &data.dsize); 
+
+	ret = gdbm_store(h->db, key, data, GDBM_REPLACE);
+
+	FREE(& data.dptr);
+
+	return ret;
+}
+
+int
+mutt_hcache_delete(void *db, const char *filename)
+{
+	datum key;
+	struct header_cache *h = db;
+	char path[_POSIX_PATH_MAX];
+
+	if (! h) {
+		return -1;
+	}
+
+	strncpy(path, h->folder, sizeof(path));
+	strncat(path, filename, sizeof(path) - strlen(path));
+
+	key.dptr  = path;
+	key.dsize = mutt_hcache_keylen(path);
+
+	return gdbm_delete(h->db, key);
+}
+#elif HAVE_DB4
+
+static struct
+header_cache
+{
+	DB_ENV *env;
+	DB *db;
+} HEADER_CACHE;
+
+static void
+mutt_hcache_dbt_init(DBT *dbt, void *data, size_t len)
+{
+	dbt->data = data;
+	dbt->size = dbt->ulen = len;
+	dbt->dlen = dbt->doff = 0;
+	dbt->flags = DB_DBT_USERMEM;
+}
+
+static void
+mutt_hcache_dbt_empty_init(DBT *dbt)
+{
+	dbt->data = NULL;
+	dbt->size = dbt->ulen = dbt->dlen = dbt->doff = 0;
+	dbt->flags = 0;
+}
+
+void *
+mutt_hcache_open(const char *path, const char *folder)
+{
+	struct stat sb;
+	u_int32_t createflags = DB_CREATE;
+	int ret;
+	struct header_cache *h = malloc(sizeof(HEADER_CACHE));
+
+	if (! path || path[0] == '\0') {
+		FREE(& h);
+		return NULL;
+	}
+
+	ret = db_env_create(&h->env, 0);
+	if (ret) {
+		FREE(& h);
+		return NULL;
+	}
+
+	ret = h->env->open(h->env, NULL, DB_INIT_MPOOL | DB_CREATE | DB_PRIVATE, 0600);
+	if (! ret) {
+		ret = db_create(&h->db, h->env, 0);
+		if (ret) {
+			h->env->close(h->env, 0);
+			FREE(& h);
+			return NULL;
+		}
+	}
+
+	if (stat(path, &sb) != 0 && errno == ENOENT) {
+		createflags |= DB_EXCL;
+		h->db->set_pagesize(h->db, (int) MaildirCachePageSize);
+	}
+
+	ret = h->db->open(h->db, NULL, path, folder, DB_BTREE, createflags, 0600);
+	if (ret) {
+		h->db->close(h->db, 0);
+		h->env->close(h->env, 0);
+		FREE(& h);
+		return NULL;
+	}
+
+	return h;
+}
+
+void
+mutt_hcache_close(void *db)
+{
+	struct header_cache *h = db;
+	int ret;
+
+	if (! h) {
+		return;
+	}
+
+	h->db->close(h->db, 0);
+	h->env->close(h->env, 0);
+
+	FREE(& h);
+}
+
+void *
+mutt_hcache_fetch(void *db, const char *filename)
+{
+	DBT key;
+	DBT data;
+	struct header_cache *h = db;
+
+	if (! h) {
+		return NULL;
+	}
+
+	filename++; /* skip '/' */
+
+	mutt_hcache_dbt_init(&key, (void *) filename, mutt_hcache_keylen(filename));
+	mutt_hcache_dbt_empty_init(&data);
+	data.flags = DB_DBT_MALLOC;
+
+	h->db->get(h->db, NULL, &key, &data, 0);
+
+	return data.data;
+}
+
+int
+mutt_hcache_store(void *db, const char *filename, HEADER *header)
+{
+	DBT key;
+	DBT data;
+	int ret;
+	struct header_cache *h = db;
+
+	if (! h) {
+		return -1;
+	}
+
+	filename++; /* skip '/' */
+
+	mutt_hcache_dbt_init(&key, (void *) filename, mutt_hcache_keylen(filename));
+
+	mutt_hcache_dbt_empty_init(&data);
+	data.flags = DB_DBT_USERMEM;
+	data.data = mutt_hcache_dump(header, (signed int *) &data.size); 
+	data.ulen = data.size;
+
+	ret = h->db->put(h->db, NULL, &key, &data, 0);
+
+	FREE(& data.data);
+
+	return ret;
+}
+
+int
+mutt_hcache_delete(void *db, const char *filename)
+{
+	DBT key;
+	struct header_cache *h = db;
+
+	if (! h) {
+		return -1;
+	}
+
+	filename++; /* skip '/' */
+
+	mutt_hcache_dbt_init(&key, (void *) filename, mutt_hcache_keylen(filename));
+	return h->db->del(h->db, NULL, &key, 0);
+}
+#endif
diff -Nru a/init.h b/init.h
--- init.h	2004-06-10 14:03:44 +02:00
+++ init.h	2004-06-10 14:03:44 +02:00
@@ -981,6 +981,28 @@
   ** \fBDON'T CHANGE THIS SETTING UNLESS YOU ARE REALLY SURE WHAT YOU ARE
   ** DOING!\fP
   */

+  ** .pp
+  ** Path to the maildir cache file. If unset no cache will be used.
+  */
+  { "maildir_cache_verify", DT_BOOL, R_NONE, OPTHCACHEVERIFY, 1 },
+  /*
+  ** .pp
+  ** Check for programs other than mutt having modified maildir
+  ** files when the header cache is in use.  This incurs one stat(2)
+  ** per message every time the folder is opened.
+  */
+  { "maildir_cache_page_size", DT_NUM, R_NONE, UL &MaildirCachePageSize, 2048 },
+  /*
+  ** .pp
+  ** Change the maildir header cache database page size.  Too large
+  ** or too small of a page size for the common header can waste
+  ** space, memory effectiveness, or CPU time.  You can use the
+  ** db_dump utility to determine the optimal page size.
+  */
+#endif /* USE_HCACHE */
   { "maildir_trash", DT_BOOL, R_NONE, OPTMAILDIRTRASH, 0 },
   /*
   ** .pp
diff -Nru a/main.c b/main.c
--- main.c	2004-06-10 14:03:44 +02:00
+++ main.c	2004-06-10 14:03:44 +02:00
@@ -411,6 +411,12 @@
 	"-HAVE_GETADDRINFO  "
 #endif

 
 #ifdef ISPELL
diff -Nru a/mh.c b/mh.c
--- mh.c	2004-06-10 14:03:44 +02:00
+++ mh.c	2004-06-10 14:03:44 +02:00
@@ -779,11 +779,65 @@
 #include <string.h>
 #include <utime.h>
 
+#if USE_HCACHE
+#include <gdbm.h>
+#endif /* USE_HCACHE */
+
 struct maildir
 {
   HEADER *h;
@@ -779,11 +783,82 @@
   return r;
 }
 
+#if USE_HCACHE
+
+static ssize_t
+maildir_cache_keylen(const char *fn)
+{
+	char *lastcolon = strrchr(fn, ':');
+
+	if (lastcolon) {
+		*lastcolon = '\0';
+	}
+
+	return strlen(fn) + 1;
+}
 
 /* 
  * This function does the second parsing pass for a maildir-style

+void maildir_delayed_parsing (CONTEXT * ctx, struct maildir *md)
+{
+	struct maildir *p;
+	void *hc = NULL;
+	char fn[_POSIX_PATH_MAX];
+	void *data;
+	datum key;
+	datum data;
+	unsigned int size;
+	struct timeval *when = NULL;
+	struct stat lastchanged;
+	int ret;
+
+	hc = mutt_hcache_open (MaildirCache, ctx->path);
+
+	for (p = md; p; p = p->next) {
+		if (! (p && p->h && !p->header_parsed)) {
+			continue;
+		}
+
+		data      = mutt_hcache_fetch (hc, p->h->path + 3);
+		when      = (struct timeval *) data;
+		key.dsize = maildir_cache_keylen(key_fn);
+		data      = mutt_hcache_fetch(db, key);
+		when      = (struct timeval *) data.dptr;
+
+		snprintf(fn, sizeof (fn), "%s/%s", ctx->path, p->h->path);
+		ret = stat(fn, &lastchanged);
+
+		if (option(OPTHCACHEVERIFY)) {
+			ret = stat(fn, &lastchanged);
+		} else {
+			lastchanged.st_mtime = 0;
+			ret = 0;
+		}
+
+		if (data != NULL
+		 && ret == 0
+		 && lastchanged.st_mtime <= when->tv_sec
+#if HAVE_LANGINFO_CODESET
+		 && mutt_hcache_charset_matches (data)
+#endif /* HAVE_LANGINFO_CODESET */
+		 ) {
+			p->h = mutt_hcache_restore ((unsigned char *)data, &p->h);
+			maildir_parse_flags (p->h, fn);
+			maildir_parse_flags(p->h, fn);
+
+		} else if (maildir_parse_message (ctx->magic, fn, p->h->old, p->h)) {
+			maildir_parse_flags(p->h, fn);
+			p->header_parsed = 1;
+			mutt_hcache_store (hc, p->h->path + 3, p->h);
+				/* only try this if db connection is available */
+				data.dptr = mutt_hcache_dump(p->h, &size); 
+				data.dsize = size;
+				mutt_hcache_store(db, key, data);
+				FREE(& data.dptr);
+			}
+		} else {
+			mutt_free_header (&p->h);
+		}
+		FREE(&data);
+	}
+	mutt_hcache_close (hc);
+}
+
+#else /* USE_HCACHE */
 
 void maildir_delayed_parsing (CONTEXT * ctx, struct maildir *md)
 {
@@ -801,7 +855,7 @@
     }
 }
 

 
 /* Read a MH/maildir style mailbox.
  *
@@ -1293,6 +1347,9 @@
 {
   char path[_POSIX_PATH_MAX], tmp[_POSIX_PATH_MAX];
   int i, j;
+#if USE_HCACHE
+  void *hc = NULL;
+#endif /* USE_HCACHE */
 
   if (ctx->magic == M_MH)
     i = mh_check_mailbox (ctx, index_hint);
@@ -1302,6 +1359,11 @@
   if (i != 0)
     return i;
 
+#if USE_HCACHE
+  if (ctx->magic == M_MAILDIR)
+    hc = mutt_hcache_open(MaildirCache, ctx->path);
+#endif /* USE_HCACHE */
+
   for (i = 0; i < ctx->msgcount; i++)
   {
     if (ctx->hdrs[i]->deleted
@@ -1310,7 +1372,13 @@
       snprintf (path, sizeof (path), "%s/%s", ctx->path, ctx->hdrs[i]->path);
       if (ctx->magic == M_MAILDIR
 	  || (option (OPTMHPURGE) && ctx->magic == M_MH))
+      {
+#if USE_HCACHE
+        if (ctx->magic == M_MAILDIR)
+          mutt_hcache_delete (hc, ctx->hdrs[i]->path + 3);
+#endif /* USE_HCACHE */
 	unlink (path);
+      }
       else if (ctx->magic == M_MH)
       {
 	/* MH just moves files out of the way when you delete them */
@@ -1332,16 +1400,21 @@
       if (ctx->magic == M_MAILDIR)
       {
 	if (maildir_sync_message (ctx, i) == -1)
-	  return -1;
+	  goto err;
       }
       else
       {
 	if (mh_sync_message (ctx, i) == -1)
-	  return -1;
+	  goto err;
       }
     }
   }
 
+#if USE_HCACHE
+  if (ctx->magic == M_MAILDIR)
+    mutt_hcache_close (hc);
+#endif /* USE_HCACHE */
+
   if (ctx->magic == M_MH)
     mh_update_sequences (ctx);
 
@@ -1362,6 +1435,13 @@
   }
 
   return 0;
+
+err:
+#if USE_HCACHE
+  if (ctx->magic == M_MAILDIR)
+    mutt_hcache_close (hc);
+#endif /* USE_HCACHE */
+  return -1;
 }
 
 static char *maildir_canon_filename (char *dest, const char *src, size_t l)
diff -Nru a/mutt.h b/mutt.h
--- mutt.h	2004-06-10 14:03:44 +02:00
+++ mutt.h	2004-06-10 14:03:44 +02:00
@@ -345,6 +345,9 @@
   OPTFORCENAME,
   OPTFORWDECODE,
   OPTFORWQUOTE,
+#if USE_HCACHE
+  OPTHCACHEVERIFY,
+#endif
   OPTHDRS,
   OPTHEADER,
   OPTHELP,
diff -Nru a/protos.h b/protos.h
--- protos.h	2004-06-10 14:03:44 +02:00
+++ protos.h	2004-06-10 14:03:44 +02:00
@@ -99,6 +99,19 @@
 ENVELOPE *mutt_read_rfc822_header (FILE *, HEADER *, short, short);
 HEADER *mutt_dup_header (HEADER *);
 
+#if USE_HCACHE
+void *mutt_hcache_open(const char *path, const char *folder);
+void mutt_hcache_close(void *db);
+HEADER *mutt_hcache_restore(const unsigned char *d, HEADER **oh);
+void *mutt_hcache_fetch(void *db, const char *filename);
+int mutt_hcache_store(void *db, const char *filename, HEADER *h);
+int mutt_hcache_delete(void *db, const char *filename);
+#if HAVE_LANGINFO_CODESET
+int mutt_hcache_charset_matches(const char *d);
+#endif /* HAVE_LANGINFO_CODESET */
+#endif /* USE_HCACHE */
+
+
 ATTACHPTR **mutt_gen_attach_list (BODY *, int, ATTACHPTR **, short *, short *, int, int);
 
 time_t mutt_decrease_mtime (const char *, struct stat *);
--- PATCHES.orig    Tue Nov  6 19:59:33 2001
+++ PATCHES     Tue Nov  6 19:59:42 2001
@@ -1,0 +1 @@
+maildir-header-cache.18

Lines 148-154 Link Here

(-)./scripts/generate-plist (-1 / +1 lines)
148	html=$(($html + 1))	148	html=$(($html + 1))
149	fi	149	fi
150	if [ "$MUTT_MAILDIR_HEADER_CACHE" = "yes" ]; then	150	if [ "$MUTT_MAILDIR_HEADER_CACHE" = "yes" ]; then
151	html=$(($html + 1))	151	html=$(($html + 3))
152	fi	152	fi
153	if [ "$MUTT_SIGNATURE_MENU" = "yes" ]; then	153	if [ "$MUTT_SIGNATURE_MENU" = "yes" ]; then
154	html=$(($html + 1))	154	html=$(($html + 1))

Return to bug 67872

Lines 81-87 Link Here

(-)./Makefile (-15 / +16 lines)
81		81
82	PORTNAME= mutt-devel	82	PORTNAME= mutt-devel
83	PORTVERSION= 1.5.6	83	PORTVERSION= 1.5.6
84	PORTREVISION= 2	84	PORTREVISION= 3
85	CATEGORIES+= mail ipv6	85	CATEGORIES+= mail ipv6
86	.if defined(WITH_MUTT_NNTP)	86	.if defined(WITH_MUTT_NNTP)
87	CATEGORIES+= news	87	CATEGORIES+= news
Lines 121-128 Link Here
121	.endif	121	.endif
122		122
123	USE_REINPLACE= yes	123	USE_REINPLACE= yes
124	USE_AUTOMAKE_VER= 14	124	USE_AUTOMAKE_VER= 18
125	USE_AUTOCONF_VER= 213	125	USE_AUTOCONF_VER= 259
126	USE_OPENSSL= yes	126	USE_OPENSSL= yes
127		127
128	PLIST= ${WRKDIR}/PLIST	128	PLIST= ${WRKDIR}/PLIST
Lines 169-181 Link Here
169	WITH_MUTT_NCURSES= yes	169	WITH_MUTT_NCURSES= yes
170	.endif	170	.endif
171	.if defined(WITH_MUTT_NCURSES)	171	.if defined(WITH_MUTT_NCURSES)
172	USE_NCURSES= yes	172	MUTT_USES_NCURSES= yes
173	.endif	173	.endif
174	.if defined(WITH_MUTT_SLANG) && !defined(USE_NCURSES)	174	.if defined(WITH_MUTT_SLANG) && !defined(MUTT_USES_NCURSES)
175	USE_SLANG= yes	175	MUTT_USES_SLANG= yes
176	.endif	176	.endif
177	.if !defined(USE_NCURSES) && !defined(WITHOUT_MUTT_NCURSES) && !defined(USE_SLANG)	177	.if !defined(MUTT_USES_NCURSES) && !defined(WITHOUT_MUTT_NCURSES) && !defined(MUTT_USES_SLANG)
178	USE_NCURSES= yes	178	MUTT_USES_NCURSES= yes
179	.endif	179	.endif
180	.if defined(WITHOUT_MUTT_SGMLFORMAT)	180	.if defined(WITHOUT_MUTT_SGMLFORMAT)
181	SGML_USED= no	181	SGML_USED= no
Lines 194-203 Link Here
194	.if defined(NOPORTDOCS)	194	.if defined(NOPORTDOCS)
195	SGML_USED= no	195	SGML_USED= no
196	.endif	196	.endif
197	.if defined(USE_NCURSES) && ${OSVERSION} < 400000	197	.if defined(MUTT_USES_NCURSES) && ${OSVERSION} < 400000
198	LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses	198	LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
199	CFLAGS+= -I${PREFIX}/include/ncurses -I${PREFIX}/include	199	CFLAGS+= -I${PREFIX}/include/ncurses -I${PREFIX}/include
200	.elif defined(USE_SLANG)	200	.elif defined(MUTT_USES_SLANG)
201	LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang	201	LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang
202	.endif	202	.endif
203	.if defined(WITH_MUTT_CYRUS_SASL)	203	.if defined(WITH_MUTT_CYRUS_SASL)
Lines 205-211 Link Here
205	LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl	205	LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl
206	.endif	206	.endif
207	.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)	207	.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
208	LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm	208	LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42
		209	CFLAGS+= -I${PREFIX}/include/db42
209	.endif	210	.endif
210	.if ! defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT)	211	.if ! defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT)
211	pre-configure::	212	pre-configure::
Lines 234-242 Link Here
234	.if defined(WITH_MUTT_LOCALES_FIX)	235	.if defined(WITH_MUTT_LOCALES_FIX)
235	CONFIGURE_ARGS+= --enable-locales-fix	236	CONFIGURE_ARGS+= --enable-locales-fix
236	.endif	237	.endif
237	.if defined(USE_NCURSES) && ${OSVERSION} < 400000	238	.if defined(MUTT_USES_NCURSES) && ${OSVERSION} < 400000
238	CONFIGURE_ARGS+= --with-curses=${PREFIX}	239	CONFIGURE_ARGS+= --with-curses=${PREFIX}
239	.elif defined(USE_SLANG)	240	.elif defined(MUTT_USES_SLANG)
240	CONFIGURE_ARGS+= --with-slang=${PREFIX}	241	CONFIGURE_ARGS+= --with-slang=${PREFIX}
241	PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.slang.gz:vvv	242	PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.slang.gz:vvv
242	.endif	243	.endif
Lines 246-252 Link Here
246	.if defined(WITHOUT_NLS)	247	.if defined(WITHOUT_NLS)
247	CONFIGURE_ARGS+= --disable-nls	248	CONFIGURE_ARGS+= --disable-nls
248	.endif	249	.endif
249	.if defined(WITHOUT_MUTT_ICONV)	250	.if defined(WITHOUT_MUTT_ICONV)
250	CONFIGURE_ARGS+= --disable-iconv	251	CONFIGURE_ARGS+= --disable-iconv
251	.else	252	.else
252	CONFIGURE_ARGS+= --with-libiconv-prefix=${PREFIX}	253	CONFIGURE_ARGS+= --with-libiconv-prefix=${PREFIX}
Lines 386-392 Link Here
386	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html	387	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
387	.endif	388	.endif
388	.endif	389	.endif
389	.if defined(USE_SLANG)	390	.if defined(MUTT_USES_SLANG)
390	@${ECHO} "====================================================" >> ${PKGMESSAGE}	391	@${ECHO} "====================================================" >> ${PKGMESSAGE}
391	@${ECHO} "You have installed ${PORTNAME} with SLANG support." >> ${PKGMESSAGE}	392	@${ECHO} "You have installed ${PORTNAME} with SLANG support." >> ${PKGMESSAGE}
392	@${ECHO} "This may work for a color terminal only when defining" >> ${PKGMESSAGE}	393	@${ECHO} "This may work for a color terminal only when defining" >> ${PKGMESSAGE}