# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1032463399 -10800
# Node ID 910afdb348ae15d85feaad850557360fc7a84214
# Parent  ce5b402f6a7a341ce22cc1934007b6d51c4df0be
don't silently ignore if expunge can't unlink() some message.

diff -r ce5b402f6a7a -r 910afdb348ae src/lib-storage/index/maildir/maildir-expunge.c
--- a/src/lib-storage/index/maildir/maildir-expunge.c	Thu Sep 19 22:01:12 2002 +0300
+++ b/src/lib-storage/index/maildir/maildir-expunge.c	Thu Sep 19 22:23:19 2002 +0300
@@ -11,18 +11,18 @@
 	const char *fname;
 	char path[1024];
 
-	/* get our file name - ignore if it's missing,
-	   we're deleting it after all.. */
 	fname = ibox->index->lookup_field(ibox->index, rec,
 					  FIELD_TYPE_LOCATION);
 	if (fname != NULL) {
 		i_snprintf(path, sizeof(path), "%s/cur/%s",
 			   ibox->index->dir, fname);
-		if (unlink(path) == -1 && errno != ENOENT) {
+		if (unlink(path) < 0) {
+			/* if it didn't exist, someone just had either
+			   deleted it or changed it's flags */
 			mail_storage_set_error(ibox->box.storage,
 					       "unlink() failed for "
 					       "message file %s: %m", path);
-			/* continue anyway */
+			return FALSE;
 		}
 	}