← Back to branch summary

~ubuntu-dev/ubuntu/lucid/dovecot/lucid-201002101901

« back to all changes in this revision

Viewing changes to src/lib-storage/index/mbox/mbox-sync.c

  • Committer: Bazaar Package Importer
  • Author(s): Marco Nenciarini
  • Date: 2009-12-17 10:52:53 UTC
  • mfrom: (1.13.2 upstream)
  • mto: This revision was merged to the branch mainline in revision 61.
  • Revision ID: james.westby@ubuntu.com-20091217105253-guybg5b34vmits39
* New upstream release.
* debian/patches/gold-fix.patch: Removed. Fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib-storage/index/mbox/mbox-sync.c
148
148
        i_assert(sync_ctx->input->v_offset != mail_ctx->mail.from_offset ||
149
149
                 sync_ctx->input->eof);
150
150
 
 
151
        if (istream_raw_mbox_is_corrupted(sync_ctx->input))
 
152
                return -1;
 
153
 
151
154
        mail_ctx->mail.body_size =
152
155
                istream_raw_mbox_get_body_size(sync_ctx->input,
153
156
                                               mail_ctx->content_length);
1144
1147
                        ret = mbox_sync_partial_seek_next(sync_ctx, uid + 1,
1145
1148
                                                          &partial,
1146
1149
                                                          &skipped_mails);
1147
 
                        if (ret <= 0) {
1148
 
                                if (ret < 0)
1149
 
                                        return -1;
 
1150
                        if (ret <= 0)
1150
1151
                                break;
1151
 
                        }
1152
1152
                }
1153
1153
        }
 
1154
        if (ret < 0)
 
1155
                return -1;
1154
1156
 
1155
1157
        if (istream_raw_mbox_is_eof(sync_ctx->input)) {
1156
1158
                /* rest of the messages in index don't exist -> expunge them */