aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@novell.com>2004-06-25 01:44:13 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-06-25 01:44:13 +0800
commit4633426c1b666ee82f6a5e663952d3370a5b572b (patch)
tree9ed0027d8ad2d403e6ec5861c7fab09e262d4657
parent38f4f2cd20d68010f15e5ace7a895903211a10f2 (diff)
downloadgsoc2013-evolution-4633426c1b666ee82f6a5e663952d3370a5b572b.tar
gsoc2013-evolution-4633426c1b666ee82f6a5e663952d3370a5b572b.tar.gz
gsoc2013-evolution-4633426c1b666ee82f6a5e663952d3370a5b572b.tar.bz2
gsoc2013-evolution-4633426c1b666ee82f6a5e663952d3370a5b572b.tar.lz
gsoc2013-evolution-4633426c1b666ee82f6a5e663952d3370a5b572b.tar.xz
gsoc2013-evolution-4633426c1b666ee82f6a5e663952d3370a5b572b.tar.zst
gsoc2013-evolution-4633426c1b666ee82f6a5e663952d3370a5b572b.zip
If we fail to lock the folder, close the lockfd and reset it to -1. Fixes
2004-06-24 Jeffrey Stedfast <fejj@novell.com> * providers/local/camel-spool-folder.c (spool_lock): If we fail to lock the folder, close the lockfd and reset it to -1. Fixes bug #54680. svn path=/trunk/; revision=26499
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/providers/local/camel-spool-folder.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 675892f47e..cc0c9c3cef 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-24 Jeffrey Stedfast <fejj@novell.com>
+
+ * providers/local/camel-spool-folder.c (spool_lock): If we fail to
+ lock the folder, close the lockfd and reset it to -1. Fixes bug
+ #54680.
+
2004-06-23 Jeffrey Stedfast <fejj@novell.com>
* providers/imap4/camel-imap4-store.c (imap4_get_folder_info):
diff --git a/camel/providers/local/camel-spool-folder.c b/camel/providers/local/camel-spool-folder.c
index 4c4a49fbf9..a1b1901142 100644
--- a/camel/providers/local/camel-spool-folder.c
+++ b/camel/providers/local/camel-spool-folder.c
@@ -166,7 +166,10 @@ spool_lock(CamelLocalFolder *lf, CamelLockType type, CamelException *ex)
}
retry++;
}
-
+
+ close (mf->lockfd);
+ mf->lockfd = -1;
+
return -1;
}