X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mh.c;h=7028dbfb62fb76805c0d086eb354b5a141ab5f69;hp=e88ddb5541930362efd4ef393e3da1e06208ecb5;hb=f335a8c113b45a45d2546630fd62ee950641a45e;hpb=74a2265af51ce89bca845adc1d68f273c9933c13 diff --git a/mh.c b/mh.c index e88ddb5..7028dbf 100644 --- a/mh.c +++ b/mh.c @@ -42,11 +42,17 @@ #include #include +#if HAVE_SYS_TIME_H +#include +#endif + struct maildir { HEADER *h; char *canon_fname; unsigned header_parsed:1; +#ifdef USE_INODESORT ino_t inode; +#endif /* USE_INODESORT */ struct maildir *next; }; @@ -632,7 +638,9 @@ static int maildir_parse_entry (CONTEXT * ctx, struct maildir ***last, entry = safe_calloc (sizeof (struct maildir), 1); entry->h = h; entry->header_parsed = (ctx->magic == M_MH); +#ifdef USE_INODESORT entry->inode = inode; +#endif /* USE_INODESORT */ **last = entry; *last = &entry->next; @@ -742,6 +750,7 @@ static int maildir_move_to_context (CONTEXT * ctx, struct maildir **md) return r; } +#ifdef USE_INODESORT /* * Merge two maildir lists according to the inode numbers. */ @@ -818,6 +827,7 @@ static struct maildir *maildir_sort_inode (struct maildir *list) right = maildir_sort_inode (right); return maildir_merge_inode (left, right); } +#endif /* USE_INODESORT */ #if USE_HCACHE static size_t maildir_hcache_keylen (const char *fn) @@ -925,7 +935,9 @@ int mh_read_dir (CONTEXT * ctx, const char *subdir) mhs_free_sequences (&mhs); } +#ifdef USE_INODESORT md = maildir_sort_inode (md); +#endif /* USE_INODESORT */ if (ctx->magic == M_MAILDIR) maildir_delayed_parsing (ctx, md);