[dovecot-cvs] dovecot/src/imap cmd-delete.c,1.3,1.4

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/imap
In directory danu:/tmp/cvs-serv32250

Modified Files:
	cmd-delete.c 
Log Message:
allow deleting selected mailbox



Index: cmd-delete.c
===================================================================
RCS file: /home/cvs/dovecot/src/imap/cmd-delete.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmd-delete.c	18 Feb 2003 11:44:42 -0000	1.3
+++ cmd-delete.c	22 Apr 2003 18:49:00 -0000	1.4
@@ -5,26 +5,29 @@
 
 int cmd_delete(struct client *client)
 {
-	const char *mailbox;
+	struct mailbox *mailbox;
+	const char *name;
 
 	/* <mailbox> */
-	if (!client_read_string_args(client, 1, &mailbox))
+	if (!client_read_string_args(client, 1, &name))
 		return FALSE;
 
-	if (strcasecmp(mailbox, "INBOX") == 0) {
+	if (strcasecmp(name, "INBOX") == 0) {
 		/* INBOX can't be deleted */
 		client_send_tagline(client, "NO INBOX can't be deleted.");
 		return TRUE;
 	}
 
-	if (client->mailbox != NULL &&
-	    strcmp(client->mailbox->name, mailbox) == 0) {
-		client_send_tagline(client,
-				    "NO Selected mailbox can't be deleted.");
-		return TRUE;
+	mailbox = client->mailbox;
+	if (mailbox != NULL && strcmp(mailbox->name, name) == 0) {
+		/* deleting selected mailbox. close it first */
+		client->mailbox = NULL;
+
+		if (!mailbox->close(mailbox))
+			client_send_untagged_storage_error(client);
 	}
 
-	if (client->storage->delete_mailbox(client->storage, mailbox))
+	if (client->storage->delete_mailbox(client->storage, name))
 		client_send_tagline(client, "OK Delete completed.");
 	else
 		client_send_storage_error(client);