From 2bfb027f1b627b03497442bd98bb4f471767d6fa Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sun, 1 Oct 2006 09:37:39 +0000 Subject: [PATCH] 2006-10-01 [colin] 2.5.2cvs31 * src/msgcache.c Don't ftruncate when not using mmap --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/msgcache.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b648082d4..406d83b9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-01 [colin] 2.5.2cvs31 + + * src/msgcache.c + Don't ftruncate when not using mmap + 2006-09-30 [colin] 2.5.2cvs30 * src/main.c diff --git a/PATCHSETS b/PATCHSETS index 7cd84efa9..5e87f3533 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1944,3 +1944,4 @@ ( cvs diff -u -r 1.213.2.116 -r 1.213.2.117 src/folder.c; cvs diff -u -r 1.115.2.106 -r 1.115.2.107 src/main.c; ) > 2.5.2cvs28.patchset ( cvs diff -u -r 1.213.2.117 -r 1.213.2.118 src/folder.c; cvs diff -u -r 1.79.2.43 -r 1.79.2.44 src/mh.c; ) > 2.5.2cvs29.patchset ( cvs diff -u -r 1.115.2.107 -r 1.115.2.108 src/main.c; ) > 2.5.2cvs30.patchset +( cvs diff -u -r 1.16.2.41 -r 1.16.2.42 src/msgcache.c; ) > 2.5.2cvs31.patchset diff --git a/configure.ac b/configure.ac index 16b1c330a..200c60088 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=5 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=30 +EXTRA_VERSION=31 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/msgcache.c b/src/msgcache.c index ae8f4f97a..00a305902 100644 --- a/src/msgcache.c +++ b/src/msgcache.c @@ -1019,11 +1019,11 @@ gint msgcache_write(const gchar *cache_file, const gchar *mark_file, MsgCache *c g_hash_table_foreach(cache->msgnum_table, msgcache_write_mmap_func, (gpointer)&write_fps); munmap(cache_data, map_len); munmap(mark_data, map_len); + ftruncate(fileno(write_fps.cache_fp), write_fps.cache_size); + ftruncate(fileno(write_fps.mark_fp), write_fps.mark_size); } else { g_hash_table_foreach(cache->msgnum_table, msgcache_write_func, (gpointer)&write_fps); } - 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); -- 2.25.1