diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-12-25 12:28:55 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-12-25 12:32:23 +0200 |
| commit | c55e2241a6809305301e4a582564daac3e44fd6f (patch) | |
| tree | a448b420c42949a4c4f56bf6eb4bfa65ef3fde2d /movemail | |
| parent | f8834aef0820f19013af3ac91856480452224440 (diff) | |
| download | mailutils-c55e2241a6809305301e4a582564daac3e44fd6f.tar.gz mailutils-c55e2241a6809305301e4a582564daac3e44fd6f.tar.bz2 | |
pop client and movemail: bugfixes
* libproto/pop/mbox.c (pop_close): Destroy the cached data.
(pop_destroy): Avoid freeing the same data twice.
(pop_body_get_stream,pop_body_size,pop_body_lines): Owner is mu_message_t.
(pop_create_body): Change the owner of the created mu_body_t object.
* movemail/movemail.c: Correctly close both mailboxes if unhandled errors
occur.
Diffstat (limited to 'movemail')
| -rw-r--r-- | movemail/movemail.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/movemail/movemail.c b/movemail/movemail.c index bc25ad745..9a0133fc4 100644 --- a/movemail/movemail.c +++ b/movemail/movemail.c @@ -1032,8 +1032,9 @@ main (int argc, char **argv) } if (app_err_count && !(onerror_flags & (ONERROR_DELETE|ONERROR_COUNT))) - /* FIXME: mailboxes are not properly closed */ - return 1; + preserve_mail = 1; + if (onerror_flags & ONERROR_COUNT) + app_err_count = 0; mu_mailbox_sync (dest); rc = mu_mailbox_close (dest); @@ -1045,9 +1046,6 @@ main (int argc, char **argv) mu_mailbox_close (source); mu_mailbox_destroy (&source); - - if (onerror_flags & ONERROR_COUNT) - app_err_count = 0; return !(rc == 0 && (app_err_count + get_err_count) == 0); } |