don't check for INBOX more than necessary

This commit is contained in:
Oswald Buddenhagen 2013-12-08 10:48:14 +01:00
parent c293acaf24
commit 0ad8ef80b2

View File

@ -228,11 +228,6 @@ maildir_list_recurse( store_t *gctx, int isBox, int *flags, const char *inbox,
if (maildir_list_inbox( gctx, flags ) < 0) if (maildir_list_inbox( gctx, flags ) < 0)
return -1; return -1;
} else { } else {
if (!memcmp( ent, "INBOX", 6 )) {
path[pathLen] = 0;
warn( "Maildir warning: ignoring INBOX in %s\n", path );
continue;
}
if (*ent == '.') { if (*ent == '.') {
if (!isBox) if (!isBox)
continue; continue;
@ -242,6 +237,11 @@ maildir_list_recurse( store_t *gctx, int isBox, int *flags, const char *inbox,
} else { } else {
if (isBox) if (isBox)
continue; continue;
if (!memcmp( ent, "INBOX", 6 )) {
path[pathLen] = 0;
warn( "Maildir warning: ignoring INBOX in %s\n", path );
continue;
}
} }
nl = nameLen + nfsnprintf( name + nameLen, _POSIX_PATH_MAX - nameLen, "%s", ent ); nl = nameLen + nfsnprintf( name + nameLen, _POSIX_PATH_MAX - nameLen, "%s", ent );
if (maildir_list_recurse( gctx, 1, flags, inbox, path, pl, name, nl ) < 0) if (maildir_list_recurse( gctx, 1, flags, inbox, path, pl, name, nl ) < 0)