1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
|
diff -Nru a/PATCHES b/PATCHES
--- a/PATCHES
+++ b/PATCHES
@@ -0,0 +1 @@
+mutt-cvs-header-cache.30
--- a/configure.in
+++ b/configure.in
@@ -804,10 +804,23 @@
OLDLIBS="$LIBS"
need_md5="yes"
+
+ ac_prefer_qdbm=yes
+ AC_ARG_WITH(qdbm, AC_HELP_STRING([--without-qdbm], [Don't use qdbm even if it is available]),
+ ac_prefer_qdbm=$withval)
+ if test x$ac_prefer_qdbm != xno; then
+ CPPFLAGS="$OLDCPPFLAGS"
+ LIBS="$OLDLIBS -lqdbm";
+ AC_CACHE_CHECK(for vlopen, ac_cv_vlopen,[
+ ac_cv_vlopen=no
+ AC_TRY_LINK([#include <villa.h>],[vlopen(0,0,0);],[ac_cv_vlopen=yes])
+ ])
+ fi
+
ac_prefer_gdbm=yes
AC_ARG_WITH(gdbm, AC_HELP_STRING([--without-gdbm], [Don't use gdbm even if it is available]),
ac_prefer_gdbm=$withval)
- if test x$ac_prefer_gdbm != xno; then
+ if test x$ac_prefer_gdbm != xno -a x$ac_cv_vlopen != xyes; then
CPPFLAGS="$OLDCPPFLAGS"
LIBS="$OLDLIBS -lgdbm";
AC_CACHE_CHECK(for gdbm_open, ac_cv_gdbmopen,[
@@ -819,7 +832,7 @@
ac_bdb_prefix=yes
AC_ARG_WITH(bdb, AC_HELP_STRING([--with-bdb[=DIR]], [Use BerkeleyDB4 if gdbm is not available]),
ac_bdb_prefix=$withval)
- if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes; then
+ if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_cv_vlopen != xyes; then
test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr"
for d in $ac_bdb_prefix; do
bdbpfx="$bdbpfx $d"
@@ -865,7 +878,11 @@
fi
fi
- if test x$ac_cv_gdbmopen = xyes; then
+ if test x$ac_cv_vlopen = xyes; then
+ CPPFLAGS="$OLDCPPFLAGS"
+ LIBS="$OLDLIBS -lqdbm";
+ AC_DEFINE(HAVE_QDBM, 1, [QDBM Support])
+ elif test x$ac_cv_gdbmopen = xyes; then
CPPFLAGS="$OLDCPPFLAGS"
LIBS="$OLDLIBS -lgdbm";
AC_DEFINE(HAVE_GDBM, 1, [GDBM Support])
--- a/hcache.c
+++ b/hcache.c
@@ -22,7 +22,11 @@
#include "config.h"
#endif /* HAVE_CONFIG_H */
-#if HAVE_GDBM
+#if HAVE_QDBM
+#include <depot.h>
+#include <cabin.h>
+#include <villa.h>
+#elif HAVE_GDBM
#include <gdbm.h>
#elif HAVE_DB4
#include <db.h>
@@ -42,7 +46,14 @@
#include "lib.h"
#include "md5.h"
-#if HAVE_GDBM
+#if HAVE_QDBM
+static struct header_cache
+{
+ VILLA *db;
+ char *folder;
+ unsigned int crc;
+} HEADER_CACHE;
+#elif HAVE_GDBM
static struct header_cache
{
GDBM_FILE db;
@@ -615,7 +626,139 @@
return h;
}
-#if HAVE_GDBM
+#if HAVE_QDBM
+void *
+mutt_hcache_open(const char *path, const char *folder)
+{
+ struct header_cache *h = safe_calloc(1, sizeof (HEADER_CACHE));
+ int flags = 0;
+#if 0 /* FIXME */
+ int pagesize = atoi(HeaderCachePageSize) ? atoi(HeaderCachePageSize) : 16384;
+#endif
+ h->db = NULL;
+ h->folder = safe_strdup(folder);
+ h->crc = generate_crc32();
+
+ if (!path || path[0] == '\0')
+ {
+ FREE(&h->folder);
+ FREE(&h);
+ return NULL;
+ }
+
+ path = mutt_hcache_per_folder(path, folder);
+
+ if (option(OPTHCACHECOMPRESS))
+ flags = VL_OZCOMP;
+
+ h->db = vlopen(path, flags | VL_OWRITER | VL_OCREAT, VL_CMPLEX);
+ if (h->db)
+ return h;
+
+ /* if rw failed try ro */
+ h->db = vlopen(path, flags | VL_OREADER, 0);
+ 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;
+
+ vlclose(h->db);
+ FREE(&h->folder);
+ FREE(&h);
+}
+
+void *
+mutt_hcache_fetch(void *db, const char *filename,
+ size_t(*keylen) (const char *fn))
+{
+ struct header_cache *h = db;
+ char path[_POSIX_PATH_MAX];
+ int ksize;
+ char *data = NULL;
+
+ if (!h)
+ return NULL;
+
+ strncpy(path, h->folder, sizeof (path));
+ safe_strcat(path, sizeof (path), filename);
+
+ ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
+
+ data = vlget(h->db, path, ksize, NULL);
+
+ if (! crc32_matches(data, h->crc))
+ {
+ if (data) {
+ FREE(&data);
+ }
+ return NULL;
+ }
+
+ return data;
+}
+
+int
+mutt_hcache_store(void *db, const char *filename, HEADER * header,
+ unsigned long uid_validity,
+ size_t(*keylen) (const char *fn))
+{
+ struct header_cache *h = db;
+ char path[_POSIX_PATH_MAX];
+ int ret;
+ int ksize, dsize;
+ char *data = NULL;
+
+ if (!h)
+ return -1;
+
+ strncpy(path, h->folder, sizeof (path));
+ safe_strcat(path, sizeof (path), filename);
+
+ ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
+
+ data = mutt_hcache_dump(db, header, &dsize, uid_validity);
+
+ ret = vlput(h->db, path, ksize, data, dsize, VL_DOVER);
+
+ FREE(&data);
+
+ return ret;
+}
+
+int
+mutt_hcache_delete(void *db, const char *filename,
+ size_t(*keylen) (const char *fn))
+{
+ struct header_cache *h = db;
+ char path[_POSIX_PATH_MAX];
+ int ksize;
+
+ if (!h)
+ return -1;
+
+ strncpy(path, h->folder, sizeof (path));
+ safe_strcat(path, sizeof (path), filename);
+
+ ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
+
+ return vlout(h->db, path, ksize);
+}
+
+#elif HAVE_GDBM
void *
mutt_hcache_open(const char *path, const char *folder)
--- a/init.h
+++ b/init.h
@@ -1079,6 +1079,15 @@
** files when the header cache is in use. This incurs one stat(2) per
** message every time the folder is opened.
*/
+#if HAVE_QDBM
+ { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, 0 },
+ /*
+ ** .pp
+ ** If enabled the header cache will be compressed. So only one fifth of the usual
+ ** diskspace is used, but the uncompression can result in a slower open of the
+ ** cached folder.
+ */
+#endif /* HAVE_QDBM */
{ "header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, UL "16384" },
/*
** .pp
--- a/mutt.h
+++ b/mutt.h
@@ -353,6 +353,9 @@
OPTFORWQUOTE,
#if USE_HCACHE
OPTHCACHEVERIFY,
+#if HAVE_QDBM
+ OPTHCACHECOMPRESS,
+#endif /* HAVE_QDBM */
#endif
OPTHDRS,
OPTHEADER,
|
