/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto & The Claws Mail Team
*
* 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#include "claws-features.h"
+#endif
+
#include "defs.h"
+#define _GNU_SOURCE
+#include <stdio.h>
+
#include <glib.h>
#include <glib/gi18n.h>
-#include <sys/mman.h>
+#ifdef _WIN32
+# include <w32lib.h>
+# define MAP_FAILED ((char *) -1)
+#else
+# include <sys/mman.h>
+#endif
+#include <sys/types.h>
+#include <sys/stat.h>
#include <time.h>
#include "procmsg.h"
#include "codeconv.h"
#include "timing.h"
+#include "tags.h"
+#include "prefs_common.h"
+
+#ifdef HAVE_FWRITE_UNLOCKED
+#define SC_FWRITE fwrite_unlocked
+#else
+#define SC_FWRITE fwrite
+#endif
#if G_BYTE_ORDER == G_BIG_ENDIAN
#define bswap_32(x) \
((x[2]&0xff) << 16) | \
((x[3]&0xff) << 24))
-static gboolean msgcache_use_mmap = FALSE;
+static gboolean msgcache_use_mmap_read = TRUE;
#else
#define bswap_32(x) (x)
((x[2]&0xff) << 16) | \
((x[3]&0xff) << 24))
-static gboolean msgcache_use_mmap = TRUE;
+static gboolean msgcache_use_mmap_read = TRUE;
#endif
static gboolean swapping = TRUE;
static gboolean msgcache_msginfo_free_func(gpointer num, gpointer msginfo, gpointer user_data)
{
- procmsg_msginfo_free((MsgInfo *)msginfo);
+ procmsg_msginfo_free((MsgInfo **)&msginfo);
return TRUE;
}
void msgcache_destroy(MsgCache *cache)
{
- g_return_if_fail(cache != NULL);
+ cm_return_if_fail(cache != NULL);
g_hash_table_foreach_remove(cache->msgnum_table, msgcache_msginfo_free_func, NULL);
g_hash_table_destroy(cache->msgid_table);
{
MsgInfo *newmsginfo;
- g_return_if_fail(cache != NULL);
- g_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(cache != NULL);
+ cm_return_if_fail(msginfo != NULL);
newmsginfo = procmsg_msginfo_new_ref(msginfo);
g_hash_table_insert(cache->msgnum_table, &newmsginfo->msgnum, newmsginfo);
cache->memusage += procmsg_msginfo_memusage(msginfo);
cache->last_access = time(NULL);
- debug_print("Cache size: %d messages, %d bytes\n", g_hash_table_size(cache->msgnum_table), cache->memusage);
+ msginfo->folder->cache_dirty = TRUE;
+
+ debug_print("Cache size: %d messages, %u bytes\n", g_hash_table_size(cache->msgnum_table), cache->memusage);
}
void msgcache_remove_msg(MsgCache *cache, guint msgnum)
{
MsgInfo *msginfo;
- g_return_if_fail(cache != NULL);
- g_return_if_fail(msgnum > 0);
+ cm_return_if_fail(cache != NULL);
msginfo = (MsgInfo *) g_hash_table_lookup(cache->msgnum_table, &msgnum);
if(!msginfo)
if(msginfo->msgid)
g_hash_table_remove(cache->msgid_table, msginfo->msgid);
g_hash_table_remove(cache->msgnum_table, &msginfo->msgnum);
- procmsg_msginfo_free(msginfo);
+
+ msginfo->folder->cache_dirty = TRUE;
+
+ procmsg_msginfo_free(&msginfo);
cache->last_access = time(NULL);
- debug_print("Cache size: %d messages, %d byte\n", g_hash_table_size(cache->msgnum_table), cache->memusage);
+
+ debug_print("Cache size: %d messages, %u bytes\n", g_hash_table_size(cache->msgnum_table), cache->memusage);
}
void msgcache_update_msg(MsgCache *cache, MsgInfo *msginfo)
{
MsgInfo *oldmsginfo, *newmsginfo;
- g_return_if_fail(cache != NULL);
- g_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(cache != NULL);
+ cm_return_if_fail(msginfo != NULL);
oldmsginfo = g_hash_table_lookup(cache->msgnum_table, &msginfo->msgnum);
if(oldmsginfo && oldmsginfo->msgid)
if (oldmsginfo) {
g_hash_table_remove(cache->msgnum_table, &oldmsginfo->msgnum);
cache->memusage -= procmsg_msginfo_memusage(oldmsginfo);
- procmsg_msginfo_free(oldmsginfo);
+ procmsg_msginfo_free(&oldmsginfo);
}
newmsginfo = procmsg_msginfo_new_ref(msginfo);
cache->memusage += procmsg_msginfo_memusage(newmsginfo);
cache->last_access = time(NULL);
- debug_print("Cache size: %d messages, %d byte\n", g_hash_table_size(cache->msgnum_table), cache->memusage);
+ debug_print("Cache size: %d messages, %u bytes\n", g_hash_table_size(cache->msgnum_table), cache->memusage);
+
+ msginfo->folder->cache_dirty = TRUE;
return;
}
{
MsgInfo *msginfo;
- g_return_val_if_fail(cache != NULL, NULL);
+ cm_return_val_if_fail(cache != NULL, NULL);
msginfo = g_hash_table_lookup(cache->msgnum_table, &num);
if(!msginfo)
{
MsgInfo *msginfo;
- g_return_val_if_fail(cache != NULL, NULL);
- g_return_val_if_fail(msgid != NULL, NULL);
+ cm_return_val_if_fail(cache != NULL, NULL);
+ cm_return_val_if_fail(msgid != NULL, NULL);
msginfo = g_hash_table_lookup(cache->msgid_table, msgid);
if(!msginfo)
MsgInfoList *msgcache_get_msg_list(MsgCache *cache)
{
MsgInfoList *msg_list = NULL;
- START_TIMING("msgcache_get_msg_list");
- g_return_val_if_fail(cache != NULL, NULL);
+ START_TIMING("");
+ cm_return_val_if_fail(cache != NULL, NULL);
g_hash_table_foreach((GHashTable *)cache->msgnum_table, msgcache_get_msg_list_func, (gpointer)&msg_list);
cache->last_access = time(NULL);
time_t msgcache_get_last_access_time(MsgCache *cache)
{
- g_return_val_if_fail(cache != NULL, 0);
+ cm_return_val_if_fail(cache != NULL, 0);
return cache->last_access;
}
gint msgcache_get_memory_usage(MsgCache *cache)
{
- g_return_val_if_fail(cache != NULL, 0);
+ cm_return_val_if_fail(cache != NULL, 0);
return cache->memusage;
}
#define READ_CACHE_DATA(data, fp, total_len) \
{ \
if ((tmp_len = msgcache_read_cache_data_str(fp, &data, conv)) < 0) { \
- procmsg_msginfo_free(msginfo); \
+ procmsg_msginfo_free(&msginfo); \
error = TRUE; \
goto bail_err; \
} \
size_t ni; \
\
if ((ni = fread(&idata, sizeof(idata), 1, fp)) != 1) { \
- g_warning("read_int: Cache data corrupted, read %d of %d at " \
- "offset %ld\n", ni, sizeof(idata), ftell(fp)); \
- procmsg_msginfo_free(msginfo); \
+ g_warning("read_int: Cache data corrupted, read %zd of %zd at " \
+ "offset %ld", ni, sizeof(idata), ftell(fp)); \
+ procmsg_msginfo_free(&msginfo); \
error = TRUE; \
goto bail_err; \
} else \
n = swapping ? bswap_32(idata) : (idata);\
}
-#define GET_CACHE_DATA_INT(n) \
-{ \
- n = (swapping ? (MMAP_TO_GUINT32_SWAPPED(walk_data)):(MMAP_TO_GUINT32(walk_data))); \
- walk_data += 4; rem_len -= 4; \
+#define GET_CACHE_DATA_INT(n) \
+{ \
+ if (rem_len < 4) { \
+ g_print("error at rem_len:%d\n", rem_len); \
+ error = TRUE; \
+ goto bail_err; \
+ } \
+ n = (swapping ? (MMAP_TO_GUINT32_SWAPPED(walk_data)):(MMAP_TO_GUINT32(walk_data))); \
+ walk_data += 4; rem_len -= 4; \
}
#define GET_CACHE_DATA(data, total_len) \
{ \
GET_CACHE_DATA_INT(tmp_len); \
+ if (rem_len < tmp_len) { \
+ g_print("error at rem_len:%d (tmp_len %d)\n", rem_len, tmp_len); \
+ error = TRUE; \
+ goto bail_err; \
+ } \
if ((tmp_len = msgcache_get_cache_data_str(walk_data, &data, tmp_len, conv)) < 0) { \
- printf("error at rem_len:%d\n", rem_len);\
- procmsg_msginfo_free(msginfo); \
+ g_print("error at rem_len:%d\n", rem_len);\
+ procmsg_msginfo_free(&msginfo); \
error = TRUE; \
goto bail_err; \
} \
guint32 idata; \
\
idata = (guint32)bswap_32(n); \
- if (fwrite(&idata, sizeof(idata), 1, fp) != 1) \
+ if (SC_FWRITE(&idata, sizeof(idata), 1, fp) != 1) \
w_err = 1; \
wrote += 4; \
}
len = strlen(data); \
WRITE_CACHE_DATA_INT(len, fp); \
if (w_err == 0 && len > 0) { \
- if (fwrite(data, 1, len, fp) != len) \
+ if (SC_FWRITE(data, 1, len, fp) != len) \
w_err = 1; \
wrote += len; \
} \
FILE *fp;
gint32 data_ver;
- g_return_val_if_fail(file != NULL, NULL);
+ cm_return_val_if_fail(file != NULL, NULL);
if (mode == DATA_WRITE) {
int w_err = 0, wrote = 0;
- if ((fp = g_fopen(file, "w+")) == NULL) {
+ if ((fp = g_fopen(file, "wb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return NULL;
}
WRITE_CACHE_DATA_INT(version, fp);
if (w_err != 0) {
- g_warning("failed to write int\n");
+ g_warning("failed to write int");
fclose(fp);
return NULL;
}
if (!swapping) {
if ((ni = fread(&len, sizeof(len), 1, fp) != 1) ||
len > G_MAXINT) {
- g_warning("read_data_str: Cache data (len) corrupted, read %d "
- "of %d bytes at offset %ld\n", ni, sizeof(len),
+ g_warning("read_data_str: Cache data (len) corrupted, read %zd "
+ "of %zd bytes at offset %ld", ni, sizeof(len),
ftell(fp));
return -1;
}
} else {
if ((ni = fread(&len, sizeof(len), 1, fp) != 1) ||
bswap_32(len) > G_MAXINT) {
- g_warning("read_data_str: Cache data (len) corrupted, read %d "
- "of %d bytes at offset %ld\n", ni, sizeof(len),
+ g_warning("read_data_str: Cache data (len) corrupted, read %zd "
+ "of %zd bytes at offset %ld", ni, sizeof(len),
ftell(fp));
return -1;
}
tmpstr = g_try_malloc(len + 1);
if(tmpstr == NULL) {
- g_warning("read_data_str: can't g_malloc %d bytes - cache data probably corrupted.\n", len);
return -1;
}
if ((ni = fread(tmpstr, 1, len, fp)) != len) {
- g_warning("read_data_str: Cache data corrupted, read %d of %d "
- "bytes at offset %ld\n",
+ g_warning("read_data_str: Cache data corrupted, read %zd of %u "
+ "bytes at offset %ld",
ni, len, ftell(fp));
g_free(tmpstr);
return -1;
if (len == 0)
return 0;
+ if(len > 2*1024*1024) {
+ g_warning("read_data_str: refusing to allocate %d bytes.", len);
+ return -1;
+ }
+
tmpstr = g_try_malloc(len + 1);
if(tmpstr == NULL) {
- g_warning("read_data_str: can't g_malloc %d bytes - cache data probably corrupted.\n", len);
return -1;
}
- strncpy(tmpstr, src, len);
-
+ memcpy(tmpstr, src, len);
tmpstr[len] = 0;
if (conv != NULL) {
return len;
}
-gchar *strconv_strdup_convert(StringConverter *conv, gchar *srcstr)
-{
- return g_strdup(srcstr);
-}
-
-gchar *strconv_charset_convert(StringConverter *conv, gchar *srcstr)
+static gchar *strconv_charset_convert(StringConverter *conv, gchar *srcstr)
{
CharsetConverter *charsetconv = (CharsetConverter *) conv;
return conv_codeset_strdup(srcstr, charsetconv->srccharset, charsetconv->dstcharset);
}
-void strconv_charset_free(StringConverter *conv)
+static void strconv_charset_free(StringConverter *conv)
{
CharsetConverter *charsetconv = (CharsetConverter *) conv;
char *cache_data = NULL;
struct stat st;
- g_return_val_if_fail(cache_file != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(cache_file != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
swapping = TRUE;
tmp_flags |= MSG_DRAFT;
}
- if (msgcache_read_cache_data_str(fp, &srccharset, NULL) < 0)
+ if (msgcache_read_cache_data_str(fp, &srccharset, NULL) < 0) {
+ fclose(fp);
return NULL;
+ }
dstcharset = CS_UTF_8;
if (srccharset == NULL || dstcharset == NULL) {
conv = NULL;
cache = msgcache_new();
- if (msgcache_use_mmap == TRUE) {
+ if (msgcache_use_mmap_read == TRUE) {
if (fstat(fileno(fp), &st) >= 0)
map_len = st.st_size;
else
map_len = -1;
- if (map_len > 0)
+ if (map_len > 0) {
+#ifdef G_OS_WIN32
+ cache_data = NULL;
+ HANDLE hFile, hMapping;
+ hFile = (HANDLE) _get_osfhandle (fileno(fp));
+ if (hFile == (HANDLE) -1)
+ goto w32_fail;
+ hMapping = CreateFileMapping(hFile, NULL, PAGE_WRITECOPY, 0, 0, NULL);
+ if (!hMapping)
+ goto w32_fail;
+ cache_data = (unsigned char *)MapViewOfFile(hMapping, FILE_MAP_COPY, 0, 0, 0);
+ CloseHandle (hMapping);
+ w32_fail:
+ ;
+#else
cache_data = mmap(NULL, map_len, PROT_READ, MAP_PRIVATE, fileno(fp), 0);
+#endif
+ }
} else {
cache_data = NULL;
}
if(msginfo->msgid)
g_hash_table_insert(cache->msgid_table, msginfo->msgid, msginfo);
}
-
- munmap(cache_data, map_len);
} else {
while (fread(&num, sizeof(num), 1, fp) == 1) {
if (swapping)
}
}
bail_err:
+ if (cache_data != NULL && cache_data != MAP_FAILED) {
+#ifdef G_OS_WIN32
+ UnmapViewOfFile((void*) cache_data);
+#else
+ munmap(cache_data, map_len);
+#endif
+ }
fclose(fp);
-
if (conv != NULL) {
if (conv->free != NULL)
conv->free(conv);
cache->memusage = memusage;
debug_print("done. (%d items read)\n", g_hash_table_size(cache->msgnum_table));
- debug_print("Cache size: %d messages, %d byte\n", g_hash_table_size(cache->msgnum_table), cache->memusage);
+ debug_print("Cache size: %d messages, %u bytes\n", g_hash_table_size(cache->msgnum_table), cache->memusage);
+
return cache;
}
gint map_len = -1;
char *cache_data = NULL;
struct stat st;
-
+ gboolean error = FALSE;
+
swapping = TRUE;
/* In case we can't open the mark file with MARK_VERSION, check if we can open it with the
}
debug_print("reading %sswapped mark file.\n", swapping?"":"un");
- if (msgcache_use_mmap) {
+ if (msgcache_use_mmap_read) {
if (fstat(fileno(fp), &st) >= 0)
map_len = st.st_size;
else
map_len = -1;
- if (map_len > 0)
+ if (map_len > 0) {
+#ifdef G_OS_WIN32
+ cache_data = NULL;
+ HANDLE hFile, hMapping;
+ hFile = (HANDLE) _get_osfhandle (fileno(fp));
+ if (hFile == (HANDLE) -1)
+ goto w32_fail2;
+ hMapping = CreateFileMapping(hFile, NULL, PAGE_WRITECOPY, 0, 0, NULL);
+ if (!hMapping)
+ goto w32_fail2;
+ cache_data = (unsigned char *)MapViewOfFile(hMapping, FILE_MAP_COPY, 0, 0, 0);
+ CloseHandle (hMapping);
+ w32_fail2:
+ ;
+#else
cache_data = mmap(NULL, map_len, PROT_READ, MAP_PRIVATE, fileno(fp), 0);
+#endif
+ }
} else {
cache_data = NULL;
}
msginfo->flags.perm_flags = perm_flags;
}
}
- munmap(cache_data, map_len);
} else {
while (fread(&num, sizeof(num), 1, fp) == 1) {
if (swapping)
num = bswap_32(num);
- if (fread(&perm_flags, sizeof(perm_flags), 1, fp) != 1) break;
+ if (fread(&perm_flags, sizeof(perm_flags), 1, fp) != 1) {
+ error = TRUE;
+ break;
+ }
if (swapping)
perm_flags = bswap_32(perm_flags);
msginfo = g_hash_table_lookup(cache->msgnum_table, &num);
}
}
}
+bail_err:
+ if (cache_data != NULL && cache_data != MAP_FAILED) {
+#ifdef G_OS_WIN32
+ UnmapViewOfFile((void*) cache_data);
+#else
+ munmap(cache_data, map_len);
+#endif
+ }
fclose(fp);
+ if (error) {
+ debug_print("error reading cache mark from %s\n", mark_file);
+ }
+}
+
+void msgcache_read_tags(MsgCache *cache, const gchar *tags_file)
+{
+ FILE *fp;
+ MsgInfo *msginfo;
+ guint32 num;
+ gint map_len = -1;
+ char *cache_data = NULL;
+ struct stat st;
+ gboolean error = FALSE;
+
+ swapping = TRUE;
+
+ /* In case we can't open the mark file with MARK_VERSION, check if we can open it with the
+ * swapped MARK_VERSION. As msgcache_open_data_file swaps it too, if this succeeds,
+ * it means it's the old version (not little-endian) on a big-endian machine. The code has
+ * no effect on x86 as their file doesn't change. */
+
+ if ((fp = msgcache_open_data_file(tags_file, TAGS_VERSION, DATA_READ, NULL, 0)) == NULL) {
+ /* see if it isn't swapped ? */
+ if ((fp = msgcache_open_data_file(tags_file, bswap_32(TAGS_VERSION), DATA_READ, NULL, 0)) == NULL)
+ return;
+ else
+ swapping = FALSE; /* yay */
+ }
+ debug_print("reading %sswapped tags file.\n", swapping?"":"un");
+
+ if (msgcache_use_mmap_read) {
+ if (fstat(fileno(fp), &st) >= 0)
+ map_len = st.st_size;
+ else
+ map_len = -1;
+ if (map_len > 0) {
+#ifdef G_OS_WIN32
+ cache_data = NULL;
+ HANDLE hFile, hMapping;
+ hFile = (HANDLE) _get_osfhandle (fileno(fp));
+ if (hFile == (HANDLE) -1)
+ goto w32_fail6;
+ hMapping = CreateFileMapping(hFile, NULL, PAGE_WRITECOPY, 0, 0, NULL);
+ if (!hMapping)
+ goto w32_fail6;
+ cache_data = (unsigned char *)MapViewOfFile(hMapping, FILE_MAP_COPY, 0, 0, 0);
+ CloseHandle (hMapping);
+ w32_fail6:
+ ;
+#else
+ cache_data = mmap(NULL, map_len, PROT_READ, MAP_PRIVATE, fileno(fp), 0);
+#endif
+ }
+ } else {
+ cache_data = NULL;
+ }
+ if (cache_data != NULL && cache_data != MAP_FAILED) {
+ int rem_len = map_len-ftell(fp);
+ char *walk_data = cache_data+ftell(fp);
+
+ while(rem_len > 0) {
+ gint id = -1;
+ GET_CACHE_DATA_INT(num);
+ msginfo = g_hash_table_lookup(cache->msgnum_table, &num);
+ if(msginfo) {
+ g_slist_free(msginfo->tags);
+ msginfo->tags = NULL;
+ do {
+ GET_CACHE_DATA_INT(id);
+ if (id > 0) {
+ msginfo->tags = g_slist_prepend(
+ msginfo->tags,
+ GINT_TO_POINTER(id));
+ }
+ } while (id > 0);
+ msginfo->tags = g_slist_reverse(msginfo->tags);
+ }
+ }
+ } else {
+ while (fread(&num, sizeof(num), 1, fp) == 1) {
+ gint id = -1;
+ if (swapping)
+ num = bswap_32(num);
+ msginfo = g_hash_table_lookup(cache->msgnum_table, &num);
+ if(msginfo) {
+ g_slist_free(msginfo->tags);
+ msginfo->tags = NULL;
+ do {
+ if (fread(&id, sizeof(id), 1, fp) != 1)
+ id = -1;
+ if (swapping)
+ id = bswap_32(id);
+ if (id > 0) {
+ msginfo->tags = g_slist_prepend(
+ msginfo->tags,
+ GINT_TO_POINTER(id));
+ }
+ } while (id > 0);
+ msginfo->tags = g_slist_reverse(msginfo->tags);
+ }
+ }
+ }
+bail_err:
+ if (cache_data != NULL && cache_data != MAP_FAILED) {
+#ifdef G_OS_WIN32
+ UnmapViewOfFile((void*) cache_data);
+#else
+ munmap(cache_data, map_len);
+#endif
+ }
+ fclose(fp);
+ if (error) {
+ debug_print("error reading cache tags from %s\n", tags_file);
+ }
}
static int msgcache_write_cache(MsgInfo *msginfo, FILE *fp)
return w_err ? -1 : wrote;
}
-static int msgcache_write_mmap_cache(MsgInfo *msginfo, char *walk_data)
-{
- MsgTmpFlags flags = msginfo->flags.tmp_flags & MSG_CACHED_FLAG_MASK;
- GSList *cur;
- int wrote = 0;
-
- PUT_CACHE_DATA_INT(msginfo->msgnum);
- PUT_CACHE_DATA_INT(msginfo->size);
- PUT_CACHE_DATA_INT(msginfo->mtime);
- PUT_CACHE_DATA_INT(msginfo->date_t);
- PUT_CACHE_DATA_INT(flags);
- PUT_CACHE_DATA(msginfo->fromname);
-
- PUT_CACHE_DATA(msginfo->date);
- PUT_CACHE_DATA(msginfo->from);
- PUT_CACHE_DATA(msginfo->to);
- PUT_CACHE_DATA(msginfo->cc);
- PUT_CACHE_DATA(msginfo->newsgroups);
- PUT_CACHE_DATA(msginfo->subject);
- PUT_CACHE_DATA(msginfo->msgid);
- PUT_CACHE_DATA(msginfo->inreplyto);
- PUT_CACHE_DATA(msginfo->xref);
- PUT_CACHE_DATA_INT(msginfo->planned_download);
- PUT_CACHE_DATA_INT(msginfo->total_size);
-
- PUT_CACHE_DATA_INT(g_slist_length(msginfo->references));
-
- for (cur = msginfo->references; cur != NULL; cur = cur->next) {
- PUT_CACHE_DATA((gchar *)cur->data);
- }
- return wrote;
-}
-
static int msgcache_write_flags(MsgInfo *msginfo, FILE *fp)
{
MsgPermFlags flags = msginfo->flags.perm_flags;
return w_err ? -1 : wrote;
}
-static int msgcache_write_mmap_flags(MsgInfo *msginfo, char *walk_data)
+static int msgcache_write_tags(MsgInfo *msginfo, FILE *fp)
{
- MsgPermFlags flags = msginfo->flags.perm_flags;
- int wrote = 0;
+ GSList *cur = msginfo->tags;
+ int w_err = 0, wrote = 0;
- PUT_CACHE_DATA_INT(msginfo->msgnum);
- PUT_CACHE_DATA_INT(flags);
- return wrote;
+ WRITE_CACHE_DATA_INT(msginfo->msgnum, fp);
+ for (; cur; cur = cur->next) {
+ gint id = GPOINTER_TO_INT(cur->data);
+ if (tags_get_tag(id) != NULL) {
+ WRITE_CACHE_DATA_INT(id, fp);
+ }
+ }
+ WRITE_CACHE_DATA_INT(-1, fp);
+
+ return w_err ? -1 : wrote;
}
struct write_fps
{
FILE *cache_fp;
FILE *mark_fp;
- char *cache_data;
- char *mark_data;
+ FILE *tags_fp;
int error;
guint cache_size;
guint mark_size;
+ guint tags_size;
};
static void msgcache_write_func(gpointer key, gpointer value, gpointer user_data)
msginfo = (MsgInfo *)value;
write_fps = user_data;
- tmp = msgcache_write_cache(msginfo, write_fps->cache_fp);
- if (tmp < 0)
- write_fps->error = 1;
- else
- write_fps->cache_size += tmp;
+ if (write_fps->cache_fp) {
+ tmp = msgcache_write_cache(msginfo, write_fps->cache_fp);
+ if (tmp < 0)
+ write_fps->error = 1;
+ else
+ write_fps->cache_size += tmp;
+ }
+ if (write_fps->mark_fp) {
tmp= msgcache_write_flags(msginfo, write_fps->mark_fp);
- if (tmp < 0)
- write_fps->error = 1;
- else
- write_fps->mark_size += tmp;
-}
-
-static void msgcache_write_mmap_func(gpointer key, gpointer value, gpointer user_data)
-{
- MsgInfo *msginfo;
- struct write_fps *write_fps;
- int tmp;
-
- msginfo = (MsgInfo *)value;
- write_fps = user_data;
-
- tmp = msgcache_write_mmap_cache(msginfo, write_fps->cache_data);
- write_fps->cache_size += tmp;
- write_fps->cache_data += tmp;
- tmp = msgcache_write_mmap_flags(msginfo, write_fps->mark_data);
- write_fps->mark_size += tmp;
- write_fps->mark_data += tmp;
+ if (tmp < 0)
+ write_fps->error = 1;
+ else
+ write_fps->mark_size += tmp;
+ }
+ if (write_fps->tags_fp) {
+ tmp = msgcache_write_tags(msginfo, write_fps->tags_fp);
+ if (tmp < 0)
+ write_fps->error = 1;
+ else
+ write_fps->tags_size += tmp;
+ }
}
-gint msgcache_write(const gchar *cache_file, const gchar *mark_file, MsgCache *cache)
+gint msgcache_write(const gchar *cache_file, const gchar *mark_file, const gchar *tags_file, MsgCache *cache)
{
struct write_fps write_fps;
- gchar *new_cache, *new_mark;
+ gchar *new_cache, *new_mark, *new_tags;
int w_err = 0, wrote = 0;
- gint map_len = -1;
- char *cache_data = NULL;
- char *mark_data = NULL;
- START_TIMING("*** writing caches");
- g_return_val_if_fail(cache_file != NULL, -1);
- g_return_val_if_fail(mark_file != NULL, -1);
- g_return_val_if_fail(cache != NULL, -1);
+
+ START_TIMING("");
+ cm_return_val_if_fail(cache != NULL, -1);
new_cache = g_strconcat(cache_file, ".new", NULL);
new_mark = g_strconcat(mark_file, ".new", NULL);
+ new_tags = g_strconcat(tags_file, ".new", NULL);
write_fps.error = 0;
write_fps.cache_size = 0;
write_fps.mark_size = 0;
- write_fps.cache_fp = msgcache_open_data_file(new_cache, CACHE_VERSION,
- DATA_WRITE, NULL, 0);
- if (write_fps.cache_fp == NULL) {
- g_free(new_cache);
- g_free(new_mark);
- return -1;
- }
+ write_fps.tags_size = 0;
- WRITE_CACHE_DATA(CS_UTF_8, write_fps.cache_fp);
+ /* open files and write headers */
- if (w_err != 0) {
- g_warning("failed to write charset\n");
- fclose(write_fps.cache_fp);
- g_unlink(new_cache);
- g_free(new_cache);
- g_free(new_mark);
- return -1;
+ if (cache_file) {
+ write_fps.cache_fp = msgcache_open_data_file(new_cache, CACHE_VERSION,
+ DATA_WRITE, NULL, 0);
+ if (write_fps.cache_fp == NULL) {
+ g_free(new_cache);
+ g_free(new_mark);
+ g_free(new_tags);
+ return -1;
+ }
+ WRITE_CACHE_DATA(CS_UTF_8, write_fps.cache_fp);
+ } else {
+ write_fps.cache_fp = NULL;
}
- write_fps.mark_fp = msgcache_open_data_file(new_mark, MARK_VERSION,
- DATA_WRITE, NULL, 0);
- if (write_fps.mark_fp == NULL) {
- fclose(write_fps.cache_fp);
- g_unlink(new_cache);
+ if (w_err != 0) {
+ g_warning("failed to write charset");
+ if (write_fps.cache_fp)
+ fclose(write_fps.cache_fp);
+ claws_unlink(new_cache);
g_free(new_cache);
g_free(new_mark);
+ g_free(new_tags);
return -1;
}
- debug_print("\tWriting message cache to %s and %s...\n", new_cache, new_mark);
-
- if (change_file_mode_rw(write_fps.cache_fp, new_cache) < 0)
- FILE_OP_ERROR(new_cache, "chmod");
-
- write_fps.cache_size = ftell(write_fps.cache_fp);
- write_fps.mark_size = ftell(write_fps.mark_fp);
- if (msgcache_use_mmap && cache->memusage > 0) {
- map_len = cache->memusage;
- if (ftruncate(fileno(write_fps.cache_fp), (off_t)map_len) == 0) {
- cache_data = mmap(NULL, map_len, PROT_WRITE, MAP_SHARED,
- fileno(write_fps.cache_fp), 0);
- }
- if (cache_data != NULL && cache_data != MAP_FAILED) {
- if (ftruncate(fileno(write_fps.mark_fp), (off_t)map_len) == 0) {
- mark_data = mmap(NULL, map_len, PROT_WRITE, MAP_SHARED,
- fileno(write_fps.mark_fp), 0);
- }
- if (mark_data == NULL || mark_data == MAP_FAILED) {
- munmap(cache_data, map_len);
- cache_data = NULL;
- }
+ if (mark_file) {
+ write_fps.mark_fp = msgcache_open_data_file(new_mark, MARK_VERSION,
+ DATA_WRITE, NULL, 0);
+ if (write_fps.mark_fp == NULL) {
+ if (write_fps.cache_fp)
+ fclose(write_fps.cache_fp);
+ claws_unlink(new_cache);
+ g_free(new_cache);
+ g_free(new_mark);
+ g_free(new_tags);
+ return -1;
}
+ } else {
+ write_fps.mark_fp = NULL;
}
- if (cache_data != NULL && cache_data != MAP_FAILED) {
- write_fps.cache_data = cache_data + ftell(write_fps.cache_fp);
- write_fps.mark_data = mark_data + ftell(write_fps.mark_fp);
- g_hash_table_foreach(cache->msgnum_table, msgcache_write_mmap_func, (gpointer)&write_fps);
- munmap(cache_data, map_len);
- munmap(mark_data, map_len);
+ if (tags_file) {
+ write_fps.tags_fp = msgcache_open_data_file(new_tags, TAGS_VERSION,
+ DATA_WRITE, NULL, 0);
+ if (write_fps.tags_fp == NULL) {
+ if (write_fps.cache_fp)
+ fclose(write_fps.cache_fp);
+ if (write_fps.mark_fp)
+ fclose(write_fps.mark_fp);
+ claws_unlink(new_cache);
+ claws_unlink(new_mark);
+ g_free(new_cache);
+ g_free(new_mark);
+ g_free(new_tags);
+ return -1;
+ }
} else {
- g_hash_table_foreach(cache->msgnum_table, msgcache_write_func, (gpointer)&write_fps);
+ write_fps.tags_fp = NULL;
}
- ftruncate(fileno(write_fps.cache_fp), write_fps.cache_size);
- ftruncate(fileno(write_fps.mark_fp), write_fps.mark_size);
- fclose(write_fps.cache_fp);
- fclose(write_fps.mark_fp);
+
+ debug_print("\tWriting message cache to %s and %s...\n", new_cache, new_mark);
+
+ if (write_fps.cache_fp && change_file_mode_rw(write_fps.cache_fp, new_cache) < 0)
+ FILE_OP_ERROR(new_cache, "chmod");
+
+ /* headers written, note file size */
+ if (write_fps.cache_fp)
+ write_fps.cache_size = ftell(write_fps.cache_fp);
+ if (write_fps.mark_fp)
+ write_fps.mark_size = ftell(write_fps.mark_fp);
+ if (write_fps.tags_fp)
+ write_fps.tags_size = ftell(write_fps.tags_fp);
+
+#ifdef HAVE_FWRITE_UNLOCKED
+ /* lock files for write once (instead of once per fwrite) */
+ if (write_fps.cache_fp)
+ flockfile(write_fps.cache_fp);
+ if (write_fps.mark_fp)
+ flockfile(write_fps.mark_fp);
+ if (write_fps.tags_fp)
+ flockfile(write_fps.tags_fp);
+#endif
+ /* write data to the files */
+ g_hash_table_foreach(cache->msgnum_table, msgcache_write_func, (gpointer)&write_fps);
+#ifdef HAVE_FWRITE_UNLOCKED
+ /* unlock files */
+ if (write_fps.cache_fp)
+ funlockfile(write_fps.cache_fp);
+ if (write_fps.mark_fp)
+ funlockfile(write_fps.mark_fp);
+ if (write_fps.tags_fp)
+ funlockfile(write_fps.tags_fp);
+#endif
+ /* flush buffers */
+ if (write_fps.cache_fp)
+ write_fps.error |= (fflush(write_fps.cache_fp) != 0);
+ if (write_fps.mark_fp)
+ write_fps.error |= (fflush(write_fps.mark_fp) != 0);
+ if (write_fps.tags_fp)
+ write_fps.error |= (fflush(write_fps.tags_fp) != 0);
+
+ /* sync to filesystem */
+ if (prefs_common.flush_metadata && write_fps.cache_fp)
+ write_fps.error |= (fsync(fileno(write_fps.cache_fp)) != 0);
+ if (prefs_common.flush_metadata && write_fps.mark_fp)
+ write_fps.error |= (fsync(fileno(write_fps.mark_fp)) != 0);
+ if (prefs_common.flush_metadata && write_fps.tags_fp)
+ write_fps.error |= (fsync(fileno(write_fps.tags_fp)) != 0);
+
+ /* close files */
+ if (write_fps.cache_fp)
+ write_fps.error |= (fclose(write_fps.cache_fp) != 0);
+ if (write_fps.mark_fp)
+ write_fps.error |= (fclose(write_fps.mark_fp) != 0);
+ if (write_fps.tags_fp)
+ write_fps.error |= (fclose(write_fps.tags_fp) != 0);
if (write_fps.error != 0) {
- g_unlink(new_cache);
- g_unlink(new_mark);
+ /* in case of error, forget all */
+ claws_unlink(new_cache);
+ claws_unlink(new_mark);
+ claws_unlink(new_tags);
g_free(new_cache);
g_free(new_mark);
+ g_free(new_tags);
return -1;
} else {
- move_file(new_cache, cache_file, TRUE);
- move_file(new_mark, mark_file, TRUE);
+ /* switch files */
+ if (cache_file)
+ move_file(new_cache, cache_file, TRUE);
+ if (mark_file)
+ move_file(new_mark, mark_file, TRUE);
+ if (tags_file)
+ move_file(new_tags, tags_file, TRUE);
cache->last_access = time(NULL);
}
g_free(new_cache);
g_free(new_mark);
+ g_free(new_tags);
debug_print("done.\n");
END_TIMING();
return 0;
projects / claws.git / blobdiff