Mercurial > dovecot > original-hg > dovecot-1.2
changeset 1943:e473d2df21be HEAD
missing index file fixes
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sat, 01 May 2004 19:22:54 +0300 |
| parents | 2b114aa7eeec |
| children | 5a3c3b4d4a02 |
| files | src/lib-index/mail-index-fsck.c src/lib-index/mail-index-lock.c src/lib-index/mail-index-private.h src/lib-index/mail-index-reset.c src/lib-index/mail-index.c |
| diffstat | 5 files changed, 40 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-index/mail-index-fsck.c Sat May 01 19:08:15 2004 +0300 +++ b/src/lib-index/mail-index-fsck.c Sat May 01 19:22:54 2004 +0300 @@ -130,6 +130,6 @@ index->filepath, error); } if (ret == 0) - mail_index_reset(index); + mail_index_mark_corrupted(index); return ret; }
--- a/src/lib-index/mail-index-lock.c Sat May 01 19:08:15 2004 +0300 +++ b/src/lib-index/mail-index-lock.c Sat May 01 19:22:54 2004 +0300 @@ -106,7 +106,7 @@ return -1; /* lost it? recreate */ - (void)mail_index_reset(index); + (void)mail_index_mark_corrupted(index); return -1; }
--- a/src/lib-index/mail-index-private.h Sat May 01 19:08:15 2004 +0300 +++ b/src/lib-index/mail-index-private.h Sat May 01 19:22:54 2004 +0300 @@ -128,6 +128,7 @@ const void *data, size_t *data_offset); void mail_index_set_inconsistent(struct mail_index *index); +int mail_index_mark_corrupted(struct mail_index *index); int mail_index_set_error(struct mail_index *index, const char *fmt, ...) __attr_format__(2, 3);
--- a/src/lib-index/mail-index-reset.c Sat May 01 19:08:15 2004 +0300 +++ b/src/lib-index/mail-index-reset.c Sat May 01 19:22:54 2004 +0300 @@ -36,6 +36,7 @@ int mail_index_reset(struct mail_index *index) { + struct mail_transaction_log *log; struct mail_index_header hdr; uint32_t file_seq; uoff_t file_offset; @@ -48,19 +49,23 @@ if (mail_index_mark_corrupted(index) < 0) return -1; - log_locked = index->log_locked; + /*log_locked = index->log_locked; if (log_locked) mail_transaction_log_sync_unlock(index->log); - mail_index_close(index); - if (mail_index_open(index, MAIL_INDEX_OPEN_FLAG_CREATE) < 0) + log = index->log; + mail_index_close(index); + index->log = log; + + if (mail_index_open(index, MAIL_INDEX_OPEN_FLAG_CREATE | + MAIL_INDEX_OPEN_FLAG_REOPEN) < 0) return -1; if (log_locked) { if (mail_transaction_log_sync_lock(index->log, &file_seq, &file_offset) < 0) return -1; - } + }*/ return 0; }
--- a/src/lib-index/mail-index.c Sat May 01 19:08:15 2004 +0300 +++ b/src/lib-index/mail-index.c Sat May 01 19:22:54 2004 +0300 @@ -655,6 +655,34 @@ index->indexid = 0; } +int mail_index_mark_corrupted(struct mail_index *index) +{ + struct mail_index_header hdr; + + if (index->readonly) + return 0; + + /* make sure we can write the header */ + if (!MAIL_INDEX_MAP_IS_IN_MEMORY(index->map)) { + if (mprotect(index->map->mmap_base, sizeof(hdr), + PROT_READ | PROT_WRITE) < 0) { + mail_index_set_syscall_error(index, "mprotect()"); + return -1; + } + } + + hdr = *index->hdr; + hdr.flags |= MAIL_INDEX_HDR_FLAG_CORRUPTED; + if (mail_index_write_header(index, &hdr) < 0) + return -1; + + if (fsync(index->fd) < 0) + return mail_index_set_syscall_error(index, "fsync()"); + + mail_index_set_inconsistent(index); + return 0; +} + int mail_index_set_syscall_error(struct mail_index *index, const char *function) {