lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

permit Maildir Stores without a Path

Browse Source 
it is perfectly reasonable to have a Store which has only an Inbox.
This commit is contained in:
Oswald Buddenhagen 2014-10-04 12:16:10 +02:00
parent 6ad7371f46
commit 608834c6f1
3 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.c
View File

@ -354,8 +354,6 @@ load_config( const char *where, int pseudo )
for (i = 0; i < N_DRIVERS; i++) for (i = 0; i < N_DRIVERS; i++)
if (drivers[i]->parse_store( &cfile, &store )) { if (drivers[i]->parse_store( &cfile, &store )) {
if (store) { if (store) {
if (!store->path)
store->path = "";
if (!store->max_size) if (!store->max_size)
store->max_size = INT_MAX; store->max_size = INT_MAX;
*storeapp = store; *storeapp = store;

2
src/drv_imap.c
View File

@ -2382,6 +2382,8 @@ imap_parse_store( conffile_t *cfg, store_conf_t **storep )
error( "%s '%s' has both Account and account-specific options\n", type, name ); error( "%s '%s' has both Account and account-specific options\n", type, name );
cfg->err = 1; cfg->err = 1;
} }
if (!store->gen.path)
store->gen.path = "";
} }
return 1; return 1;
} }

46
src/drv_maildir.c
View File

@ -121,23 +121,39 @@ maildir_join_path( const char *prefix, const char *box )
return out; return out;
} }
static int
maildir_validate_path( const store_conf_t *conf )
{
struct stat st;
if (!conf->path) {
error( "Maildir error: store '%s' has no Path\n", conf->name );
return -1;
}
if (stat( conf->path, &st ) || !S_ISDIR(st.st_mode)) {
error( "Maildir error: cannot open store '%s'\n", conf->path );
return -1;
}
return 0;
}
static void static void
maildir_open_store( store_conf_t *conf, const char *label ATTR_UNUSED, maildir_open_store( store_conf_t *conf, const char *label ATTR_UNUSED,
void (*cb)( store_t *ctx, void *aux ), void *aux ) void (*cb)( store_t *ctx, void *aux ), void *aux )
{ {
maildir_store_t *ctx; maildir_store_t *ctx;
struct stat st;
if (stat( conf->path, &st ) || !S_ISDIR(st.st_mode)) {
error( "Maildir error: cannot open store '%s'\n", conf->path );
cb( 0, aux );
return;
}
ctx = nfcalloc( sizeof(*ctx) ); ctx = nfcalloc( sizeof(*ctx) );
ctx->gen.conf = conf; ctx->gen.conf = conf;
ctx->uvfd = -1; ctx->uvfd = -1;
if (conf->trash) if (conf->trash) {
if (maildir_validate_path( conf ) < 0) {
free( ctx );
cb( 0, aux );
return;
}
ctx->trash = maildir_join_path( conf->path, conf->trash ); ctx->trash = maildir_join_path( conf->path, conf->trash );
}
cb( &ctx->gen, aux ); cb( &ctx->gen, aux );
} }
@ -267,6 +283,8 @@ maildir_list_path( store_t *gctx, int *flags )
{ {
char path[_POSIX_PATH_MAX], name[_POSIX_PATH_MAX]; char path[_POSIX_PATH_MAX], name[_POSIX_PATH_MAX];
if (maildir_validate_path( gctx->conf ) < 0)
return -1;
return maildir_list_recurse( return maildir_list_recurse(
gctx, 0, flags, ((maildir_store_conf_t *)gctx->conf)->inbox, gctx, 0, flags, ((maildir_store_conf_t *)gctx->conf)->inbox,
path, nfsnprintf( path, _POSIX_PATH_MAX, "%s", gctx->conf->path ), path, nfsnprintf( path, _POSIX_PATH_MAX, "%s", gctx->conf->path ),
@ -922,10 +940,16 @@ maildir_select( store_t *gctx, int create,
#ifdef USE_DB #ifdef USE_DB
ctx->db = 0; ctx->db = 0;
#endif /* USE_DB */ #endif /* USE_DB */
gctx->path = if (!memcmp( gctx->name, "INBOX", 5 ) && (!gctx->name[5] || gctx->name[5] == '/')) {
(!memcmp( gctx->name, "INBOX", 5 ) && (!gctx->name[5] || gctx->name[5] == '/')) ? gctx->path = maildir_join_path( ((maildir_store_conf_t *)gctx->conf)->inbox, gctx->name + 5 );
maildir_join_path( ((maildir_store_conf_t *)gctx->conf)->inbox, gctx->name + 5 ) : } else {
maildir_join_path( gctx->conf->path, gctx->name ); if (maildir_validate_path( gctx->conf ) < 0) {
maildir_invoke_bad_callback( gctx );
cb( DRV_CANCELED, aux );
return;
}
gctx->path = maildir_join_path( gctx->conf->path, gctx->name );
}
if ((ret = maildir_validate( gctx->path, create, ctx )) != DRV_OK) { if ((ret = maildir_validate( gctx->path, create, ctx )) != DRV_OK) {
cb( ret, aux ); cb( ret, aux );