[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-storage.c, 1.137, 1.138

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/maildir
In directory talvi:/tmp/cvs-serv8887/lib-storage/index/maildir

Modified Files:
	maildir-storage.c 
Log Message:
rename and delete operations didn't touch control directory if it was
different from maildir or index dir.



Index: maildir-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- maildir-storage.c	10 Dec 2006 13:01:30 -0000	1.137
+++ maildir-storage.c	15 Dec 2006 22:52:11 -0000	1.138
@@ -591,7 +591,7 @@
 				  const char *name)
 {
 	struct stat st;
-	const char *src, *dest, *index_dir;
+	const char *src, *dest, *index_dir, *control_dir;
 	int count;
 
 	mail_storage_clear_error(_storage);
@@ -635,6 +635,19 @@
 			return -1;
 		}
 	}
+	control_dir = mailbox_list_get_path(_storage->list, name,
+					    MAILBOX_LIST_PATH_TYPE_CONTROL);
+	if (strcmp(control_dir, src) != 0 &&
+	    strcmp(control_dir, index_dir) != 0) {
+		i_assert(*name != '/' && *name != '~');
+
+		if (unlink_directory(control_dir, TRUE) < 0 &&
+		    errno != ENOTEMPTY) {
+			mail_storage_set_critical(_storage,
+				"unlink_directory(%s) failed: %m", control_dir);
+			return -1;
+		}
+	}
 
 	dest = maildir_get_unlink_dest(_storage, name);
 	if (dest == NULL) {
@@ -678,15 +691,14 @@
 	return 0;
 }
 
-static int rename_indexes(struct mail_storage *storage,
-			  const char *oldname, const char *newname)
+static int rename_dir(struct mail_storage *storage,
+		      enum mailbox_list_path_type type,
+		      const char *oldname, const char *newname)
 {
 	const char *oldpath, *newpath;
 
-	oldpath = mailbox_list_get_path(storage->list, oldname,
-					MAILBOX_LIST_PATH_TYPE_INDEX);
-	newpath = mailbox_list_get_path(storage->list, newname,
-					MAILBOX_LIST_PATH_TYPE_INDEX);
+	oldpath = mailbox_list_get_path(storage->list, oldname, type);
+	newpath = mailbox_list_get_path(storage->list, newname, type);
 	if (strcmp(oldpath, newpath) == 0)
 		return 0;
 
@@ -770,7 +782,10 @@
 			break;
 		}
 
-		(void)rename_indexes(storage, old_listname, new_listname);
+		(void)rename_dir(storage, MAILBOX_LIST_PATH_TYPE_CONTROL,
+				 old_listname, new_listname);
+		(void)rename_dir(storage, MAILBOX_LIST_PATH_TYPE_INDEX,
+				 old_listname, new_listname);
 		t_pop();
 	}
 	array_free(&names_arr);
@@ -809,7 +824,10 @@
 
 	ret = rename(oldpath, newpath);
 	if (ret == 0 || errno == ENOENT) {
-		(void)rename_indexes(_storage, oldname, newname);
+		(void)rename_dir(_storage, MAILBOX_LIST_PATH_TYPE_CONTROL,
+				 oldname, newname);
+		(void)rename_dir(_storage, MAILBOX_LIST_PATH_TYPE_INDEX,
+				 oldname, newname);
 
 		found = ret == 0;
 		ret = rename_subfolders(_storage, oldname, newname);