Mercurial > dovecot > original-hg > dovecot-1.2
changeset 5535:7aa36ab24c3b HEAD
Changed convert_skip_dotfiles to convert_skip_dotdirs.
convert_skip_broken_mailboxes=yes is enough to skip non-mbox dotfiles.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Tue, 10 Apr 2007 17:37:19 +0300 |
| parents | c69786bd2017 |
| children | fab24638eee7 |
| files | dovecot-example.conf src/plugins/convert/convert-plugin.c src/plugins/convert/convert-storage.c src/plugins/convert/convert-storage.h src/plugins/convert/convert-tool.c |
| diffstat | 5 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/dovecot-example.conf Tue Apr 10 17:30:30 2007 +0300 +++ b/dovecot-example.conf Tue Apr 10 17:37:19 2007 +0300 @@ -1064,8 +1064,8 @@ #convert_mail = mbox:%h/mail # Skip mailboxes which we can't open successfully instead of aborting. #convert_skip_broken_mailboxes = no - # Skip mailboxes beginning with '.'. - #convert_skip_dotfiles = no + # Skip diretories beginning with '.' + #convert_skip_dotdirs = no # If source storage has mailbox names with destination storage's hierarchy # separators, replace them with this character. #convert_alt_hierarchy_char = _
--- a/src/plugins/convert/convert-plugin.c Tue Apr 10 17:30:30 2007 +0300 +++ b/src/plugins/convert/convert-plugin.c Tue Apr 10 17:37:19 2007 +0300 @@ -30,7 +30,7 @@ i_fatal("convert plugin: HOME unset"); set.skip_broken_mailboxes = getenv("CONVERT_SKIP_BROKEN_MAILBOXES") != NULL; - set.skip_dotfiles = getenv("CONVERT_SKIP_DOTFILES") != NULL; + set.skip_dotdirs = getenv("CONVERT_SKIP_DOTDIRS") != NULL; str = getenv("CONVERT_ALT_HIERARCHY_CHAR"); set.alt_hierarchy_char = *str != '\0' ? *str : '_';
--- a/src/plugins/convert/convert-storage.c Tue Apr 10 17:30:30 2007 +0300 +++ b/src/plugins/convert/convert-storage.c Tue Apr 10 17:37:19 2007 +0300 @@ -138,12 +138,13 @@ if ((info->flags & MAILBOX_NONEXISTENT) != 0) return 0; - if (*info->name == '.' && set->skip_dotfiles) - return 0; name = strcasecmp(info->name, "INBOX") == 0 ? "INBOX" : info->name; if ((info->flags & MAILBOX_NOSELECT) != 0) { /* \NoSelect mailbox, so it's probably a "directory" */ + if (*info->name == '.' && set->skip_dotdirs) + return 0; + dest_name = mailbox_name_convert(dest_storage, source_storage, set, name); if (mail_storage_mailbox_create(dest_storage, dest_name,
--- a/src/plugins/convert/convert-storage.h Tue Apr 10 17:30:30 2007 +0300 +++ b/src/plugins/convert/convert-storage.h Tue Apr 10 17:37:19 2007 +0300 @@ -5,7 +5,7 @@ const char *user; const char *home; bool skip_broken_mailboxes; - bool skip_dotfiles; + bool skip_dotdirs; char alt_hierarchy_char; };
--- a/src/plugins/convert/convert-tool.c Tue Apr 10 17:30:30 2007 +0300 +++ b/src/plugins/convert/convert-tool.c Tue Apr 10 17:37:19 2007 +0300 @@ -38,8 +38,8 @@ for (i = 5; i < argc; i++) { if (strcmp(argv[i], "skip_broken_mailboxes") != 0) set.skip_broken_mailboxes = TRUE; - else if (strcmp(argv[i], "skip_dotfiles") != 0) - set.skip_dotfiles = TRUE; + else if (strcmp(argv[i], "skip_dotdirs") != 0) + set.skip_dotdirs = TRUE; else if (strncmp(argv[i], "alt_hierarchy_char=", 19) != 0) set.alt_hierarchy_char = argv[i][19]; }