1 files changed, 68 insertions, 0 deletions
diff --git a/src/imap/cmd-expunge.c b/src/imap/cmd-expunge.c
new file mode 100644
index 0000000..7388937
--- /dev/null
+++ b/src/imap/cmd-expunge.c
@@ -0,0 +1,68 @@
+/* Copyright (c) 2002-2018 Dovecot authors, see the included COPYING file */
+
+#include "imap-common.h"
+#include "imap-commands.h"
+#include "imap-search-args.h"
+#include "imap-expunge.h"
+
+static bool ATTR_NULL(2)
+cmd_expunge_finish(struct client_command_context *cmd,
+		   struct mail_search_args *search_args)
+{
+	struct client *client = cmd->client;
+	const char *errstr;
+	enum mail_error error = MAIL_ERROR_NONE;
+	int ret;
+
+	ret = imap_expunge(client->mailbox, search_args == NULL ? NULL :
+			   search_args->args, &client->expunged_count);
+	if (search_args != NULL)
+		mail_search_args_unref(&search_args);
+	if (ret < 0) {
+		errstr = mailbox_get_last_error(client->mailbox, &error);
+		if (error != MAIL_ERROR_PERM) {
+			client_send_box_error(cmd, client->mailbox);
+			return TRUE;
+		} else {
+			return cmd_sync(cmd, 0, IMAP_SYNC_FLAG_SAFE,
+				t_strdup_printf("OK Expunge ignored: %s.",
+						errstr));
+		}
+	}
+
+	client->sync_seen_deletes = FALSE;
+	return cmd_sync(cmd, MAILBOX_SYNC_FLAG_EXPUNGE,
+			IMAP_SYNC_FLAG_SAFE, "OK Expunge completed.");
+}
+
+bool cmd_uid_expunge(struct client_command_context *cmd)
+{
+	const struct imap_arg *args;
+	struct mail_search_args *search_args;
+	const char *uidset;
+	int ret;
+
+	if (!client_read_args(cmd, 1, 0, &args))
+		return FALSE;
+
+	if (!client_verify_open_mailbox(cmd))
+		return TRUE;
+
+	if (!imap_arg_get_astring(&args[0], &uidset)) {
+		client_send_command_error(cmd, "Invalid arguments.");
+		return TRUE;
+	}
+
+	ret = imap_search_get_seqset(cmd, uidset, TRUE, &search_args);
+	if (ret <= 0)
+		return ret < 0;
+	return cmd_expunge_finish(cmd, search_args);
+}
+
+bool cmd_expunge(struct client_command_context *cmd)
+{
+	if (!client_verify_open_mailbox(cmd))
+		return TRUE;
+
+	return cmd_expunge_finish(cmd, NULL);
+}