← Back to branch summary

~ubuntu-branches/ubuntu/wily/dovecot/wily

« back to all changes in this revision

Viewing changes to src/imap/cmd-close.c

  • Committer: Package Import Robot
  • Author(s): Jaldhar H. Vyas
  • Date: 2013-09-09 00:57:32 UTC
  • mfrom: (1.13.11)
  • mto: (4.8.5 experimental) (1.16.1)
  • mto: This revision was merged to the branch mainline in revision 97.
  • Revision ID: package-import@ubuntu.com-20130909005732-dn1eell8srqbhh0e
Tags: upstream-2.2.5
Import upstream version 2.2.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/imap/cmd-close.c
1
 
/* Copyright (c) 2002-2012 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2002-2013 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "imap-common.h"
4
4
#include "imap-commands.h"
9
9
        struct client *client = cmd->client;
10
10
        struct mailbox *mailbox = client->mailbox;
11
11
        struct mail_storage *storage;
 
12
        const char *errstr, *tagged_reply = "OK Close completed.";
 
13
        enum mail_error error = MAIL_ERROR_NONE;
12
14
 
13
15
        if (!client_verify_open_mailbox(cmd))
14
16
                return TRUE;
17
19
        client->mailbox = NULL;
18
20
 
19
21
        storage = mailbox_get_storage(mailbox);
20
 
        if (imap_expunge(mailbox, NULL) < 0)
21
 
                client_send_untagged_storage_error(client, storage);
 
22
        if (imap_expunge(mailbox, NULL) < 0) {
 
23
                errstr = mailbox_get_last_error(mailbox, &error);
 
24
                if (error != MAIL_ERROR_PERM)
 
25
                        client_send_untagged_storage_error(client, storage);
 
26
                else {
 
27
                        tagged_reply = t_strdup_printf(
 
28
                                "OK Closed without expunging: %s", errstr);
 
29
                }
 
30
        }
22
31
        if (mailbox_sync(mailbox, 0) < 0)
23
32
                client_send_untagged_storage_error(client, storage);
24
33
 
25
34
        mailbox_free(&mailbox);
26
35
        client_update_mailbox_flags(client, NULL);
27
36
 
28
 
        client_send_tagline(cmd, "OK Close completed.");
 
37
        client_send_tagline(cmd, tagged_reply);
29
38
        return TRUE;
30
39
}