sipp11
/
mbsync
mirror of https://git.code.sf.net/p/isync/isync
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

let driver_t::list_store() return the list of boxes 

... and make 'boxes' and 'listed' private to the drivers.
wip/movedetect
Oswald Buddenhagen 8 years ago
parent
8b7d3792e4
commit
6e32b88f3d
4 changed files with 62 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/driver.h
  2. 36
      src/drv_imap.c
  3. 74
      src/drv_maildir.c
  4. 5
      src/main.c

7
src/driver.h
Unescape View File

@ -86,8 +86,6 @@ typedef struct message {
typedef struct store { typedef struct store {
struct store *next; struct store *next;
store_conf_t *conf; /* foreign */ store_conf_t *conf; /* foreign */
string_list_t *boxes; /* _list results - own */
char listed; /* was _list already run? */
/* currently open mailbox */ /* currently open mailbox */
message_t *msgs; /* own */ message_t *msgs; /* own */
@ -161,9 +159,10 @@ struct driver {
* Pending commands will have their callbacks synchronously invoked with DRV_CANCELED. */ * Pending commands will have their callbacks synchronously invoked with DRV_CANCELED. */
void (*cancel_store)( store_t *ctx ); void (*cancel_store)( store_t *ctx );
/* List the mailboxes in this store. Flags are ORed LIST_* values. */ /* List the mailboxes in this store. Flags are ORed LIST_* values.
* The returned box list remains owned by the driver. */
void (*list_store)( store_t *ctx, int flags, void (*list_store)( store_t *ctx, int flags,
void (*cb)( int sts, void *aux ), void *aux ); void (*cb)( int sts, string_list_t *boxes, void *aux ), void *aux );
/* Invoked before open_box(), this informs the driver which box is to be opened. */ /* Invoked before open_box(), this informs the driver which box is to be opened. */
int (*select_box)( store_t *ctx, const char *name ); int (*select_box)( store_t *ctx, const char *name );

36
src/drv_imap.c
Unescape View File

@ -107,6 +107,8 @@ struct imap_store {
uint got_namespace:1; uint got_namespace:1;
char delimiter[2]; /* hierarchy delimiter */ char delimiter[2]; /* hierarchy delimiter */
list_t *ns_personal, *ns_other, *ns_shared; /* NAMESPACE info */ list_t *ns_personal, *ns_other, *ns_shared; /* NAMESPACE info */
string_list_t *boxes; // _list results
char listed; // was _list already run with these flags?
message_t **msgapp; /* FETCH results */ message_t **msgapp; /* FETCH results */
uint caps; /* CAPABILITY results */ uint caps; /* CAPABILITY results */
string_list_t *auth_mechs; string_list_t *auth_mechs;
@ -1257,8 +1259,8 @@ parse_list_rsp_p2( imap_store_t *ctx, list_t *list, char *cmd ATTR_UNUSED )
warn( "IMAP warning: ignoring mailbox %s (reserved character '/' in name)\n", arg ); warn( "IMAP warning: ignoring mailbox %s (reserved character '/' in name)\n", arg );
goto skip; goto skip;
} }
narg->next = ctx->gen.boxes; narg->next = ctx->boxes;
ctx->gen.boxes = narg; ctx->boxes = narg;
skip: skip:
free_list( list ); free_list( list );
return LIST_OK; return LIST_OK;
@ -1527,7 +1529,7 @@ static void
imap_cleanup_store( imap_store_t *ctx ) imap_cleanup_store( imap_store_t *ctx )
{ {
free_generic_messages( ctx->gen.msgs ); free_generic_messages( ctx->gen.msgs );
free_string_list( ctx->gen.boxes ); free_string_list( ctx->boxes );
} }
static void static void
@ -2901,16 +2903,16 @@ imap_find_new_msgs_p3( imap_store_t *ctx, imap_cmd_t *gcmd, int response )
typedef struct { typedef struct {
imap_cmd_refcounted_state_t gen; imap_cmd_refcounted_state_t gen;
void (*callback)( int sts, void *aux ); void (*callback)( int sts, string_list_t *, void *aux );
void *callback_aux; void *callback_aux;
} imap_list_store_state_t; } imap_list_store_state_t;
static void imap_list_store_p2( imap_store_t *, imap_cmd_t *, int ); static void imap_list_store_p2( imap_store_t *, imap_cmd_t *, int );
static void imap_list_store_p3( imap_list_store_state_t * ); static void imap_list_store_p3( imap_store_t *, imap_list_store_state_t * );
static void static void
imap_list_store( store_t *gctx, int flags, imap_list_store( store_t *gctx, int flags,
void (*cb)( int sts, void *aux ), void *aux ) void (*cb)( int sts, string_list_t *boxes, void *aux ), void *aux )
{ {
imap_store_t *ctx = (imap_store_t *)gctx; imap_store_t *ctx = (imap_store_t *)gctx;
INIT_REFCOUNTED_STATE(imap_list_store_state_t, sts, cb, aux) INIT_REFCOUNTED_STATE(imap_list_store_state_t, sts, cb, aux)
@ -2931,36 +2933,36 @@ imap_list_store( store_t *gctx, int flags,
// //
int pfx_is_empty = !*ctx->prefix; int pfx_is_empty = !*ctx->prefix;
int pfx_is_inbox = !pfx_is_empty && is_inbox( ctx, ctx->prefix, -1 ); int pfx_is_inbox = !pfx_is_empty && is_inbox( ctx, ctx->prefix, -1 );
if (((flags & (LIST_PATH | LIST_PATH_MAYBE)) || pfx_is_empty) && !pfx_is_inbox && !(ctx->gen.listed & LIST_PATH)) { if (((flags & (LIST_PATH | LIST_PATH_MAYBE)) || pfx_is_empty) && !pfx_is_inbox && !(ctx->listed & LIST_PATH)) {
ctx->gen.listed |= LIST_PATH; ctx->listed |= LIST_PATH;
if (pfx_is_empty) if (pfx_is_empty)
ctx->gen.listed |= LIST_INBOX; ctx->listed |= LIST_INBOX;
imap_exec( ctx, imap_refcounted_new_cmd( &sts->gen ), imap_list_store_p2, imap_exec( ctx, imap_refcounted_new_cmd( &sts->gen ), imap_list_store_p2,
"LIST \"\" \"%\\s*\"", ctx->prefix ); "LIST \"\" \"%\\s*\"", ctx->prefix );
} }
if (((flags & LIST_INBOX) || pfx_is_inbox) && !pfx_is_empty && !(ctx->gen.listed & LIST_INBOX)) { if (((flags & LIST_INBOX) || pfx_is_inbox) && !pfx_is_empty && !(ctx->listed & LIST_INBOX)) {
ctx->gen.listed |= LIST_INBOX; ctx->listed |= LIST_INBOX;
if (pfx_is_inbox) if (pfx_is_inbox)
ctx->gen.listed |= LIST_PATH; ctx->listed |= LIST_PATH;
imap_exec( ctx, imap_refcounted_new_cmd( &sts->gen ), imap_list_store_p2, imap_exec( ctx, imap_refcounted_new_cmd( &sts->gen ), imap_list_store_p2,
"LIST \"\" INBOX*" ); "LIST \"\" INBOX*" );
} }
imap_list_store_p3( sts ); imap_list_store_p3( ctx, sts );
} }
static void static void
imap_list_store_p2( imap_store_t *ctx ATTR_UNUSED, imap_cmd_t *cmd, int response ) imap_list_store_p2( imap_store_t *ctx, imap_cmd_t *cmd, int response )
{ {
imap_list_store_state_t *sts = (imap_list_store_state_t *)((imap_cmd_refcounted_t *)cmd)->state; imap_list_store_state_t *sts = (imap_list_store_state_t *)((imap_cmd_refcounted_t *)cmd)->state;
transform_refcounted_box_response( &sts->gen, response ); transform_refcounted_box_response( &sts->gen, response );
imap_list_store_p3( sts ); imap_list_store_p3( ctx, sts );
} }
static void static void
imap_list_store_p3( imap_list_store_state_t *sts ) imap_list_store_p3( imap_store_t *ctx, imap_list_store_state_t *sts )
{ {
DONE_REFCOUNTED_STATE(sts) DONE_REFCOUNTED_STATE_ARGS(sts, ctx->boxes)
} }
/******************* imap_cancel_cmds *******************/ /******************* imap_cancel_cmds *******************/

74
src/drv_maildir.c
Unescape View File

@ -79,6 +79,8 @@ typedef struct {
DB *db; DB *db;
char *usedb; char *usedb;
#endif /* USE_DB */ #endif /* USE_DB */
string_list_t *boxes; // _list results
char listed; // was _list already run with these flags?
wakeup_t lcktmr; wakeup_t lcktmr;
void (*bad_callback)( void *aux ); void (*bad_callback)( void *aux );
@ -282,7 +284,7 @@ maildir_free_store( store_t *gctx )
maildir_cleanup( gctx ); maildir_cleanup( gctx );
wipe_wakeup( &ctx->lcktmr ); wipe_wakeup( &ctx->lcktmr );
free( ctx->trash ); free( ctx->trash );
free_string_list( gctx->boxes ); free_string_list( ctx->boxes );
free( gctx ); free( gctx );
} }
@ -307,18 +309,18 @@ maildir_invoke_bad_callback( maildir_store_t *ctx )
} }
static int static int
maildir_list_maildirpp( store_t *gctx, int flags, const char *inbox ) maildir_list_maildirpp( maildir_store_t *ctx, int flags, const char *inbox )
{ {
DIR *dir; DIR *dir;
struct dirent *de; struct dirent *de;
int warned = 0; int warned = 0;
struct stat st; struct stat st;
if (gctx->listed & LIST_PATH) // Implies LIST_INBOX if (ctx->listed & LIST_PATH) // Implies LIST_INBOX
return 0; return 0;
if (!(gctx->listed & LIST_INBOX)) if (!(ctx->listed & LIST_INBOX))
add_string_list( &gctx->boxes, "INBOX" ); add_string_list( &ctx->boxes, "INBOX" );
char path[_POSIX_PATH_MAX]; char path[_POSIX_PATH_MAX];
int pathLen = nfsnprintf( path, _POSIX_PATH_MAX, "%s/", inbox ); int pathLen = nfsnprintf( path, _POSIX_PATH_MAX, "%s/", inbox );
@ -335,7 +337,7 @@ maildir_list_maildirpp( store_t *gctx, int flags, const char *inbox )
char name[_POSIX_PATH_MAX]; char name[_POSIX_PATH_MAX];
char *effName = name; char *effName = name;
if (*ent == '.') { if (*ent == '.') {
if (gctx->listed & LIST_INBOX) if (ctx->listed & LIST_INBOX)
continue; continue;
if (!*++ent) if (!*++ent)
continue; continue;
@ -362,27 +364,27 @@ maildir_list_maildirpp( store_t *gctx, int flags, const char *inbox )
if (name[i] == '.') if (name[i] == '.')
name[i] = '/'; name[i] = '/';
} }
add_string_list( &gctx->boxes, effName ); add_string_list( &ctx->boxes, effName );
} }
} }
closedir (dir); closedir (dir);
if (flags & (LIST_PATH | LIST_PATH_MAYBE)) if (flags & (LIST_PATH | LIST_PATH_MAYBE))
gctx->listed |= LIST_PATH; ctx->listed |= LIST_PATH;
gctx->listed |= LIST_INBOX; ctx->listed |= LIST_INBOX;
return 0; return 0;
} }
static int maildir_list_inbox( store_t *gctx, int flags, const char *basePath ); static int maildir_list_inbox( maildir_store_t *ctx, int flags, const char *basePath );
static int maildir_list_path( store_t *gctx, int flags, const char *inbox ); static int maildir_list_path( maildir_store_t *ctx, int flags, const char *inbox );
static int static int
maildir_list_recurse( store_t *gctx, int isBox, int flags, maildir_list_recurse( maildir_store_t *ctx, int isBox, int flags,
const char *inbox, int inboxLen, const char *basePath, int basePathLen, const char *inbox, int inboxLen, const char *basePath, int basePathLen,
char *path, int pathLen, char *name, int nameLen ) char *path, int pathLen, char *name, int nameLen )
{ {
DIR *dir; DIR *dir;
int style = ((maildir_store_conf_t *)gctx->conf)->sub_style; int style = ((maildir_store_conf_t *)ctx->gen.conf)->sub_style;
int pl, nl; int pl, nl;
struct dirent *de; struct dirent *de;
struct stat st; struct stat st;
@ -395,7 +397,7 @@ maildir_list_recurse( store_t *gctx, int isBox, int flags,
} }
if (isBox > 1 && style == SUB_UNSET) { if (isBox > 1 && style == SUB_UNSET) {
error( "Maildir error: found subfolder '%.*s', but store '%s' does not specify SubFolders style\n", error( "Maildir error: found subfolder '%.*s', but store '%s' does not specify SubFolders style\n",
nameLen - 1, name, gctx->conf->name ); nameLen - 1, name, ctx->gen.conf->name );
closedir( dir ); closedir( dir );
return -1; return -1;
} }
@ -409,13 +411,13 @@ maildir_list_recurse( store_t *gctx, int isBox, int flags,
pl += pathLen; pl += pathLen;
if (inbox && equals( path, pl, inbox, inboxLen )) { if (inbox && equals( path, pl, inbox, inboxLen )) {
// Inbox nested into Path. // Inbox nested into Path.
if (maildir_list_inbox( gctx, flags, 0 ) < 0) { if (maildir_list_inbox( ctx, flags, 0 ) < 0) {
closedir( dir ); closedir( dir );
return -1; return -1;
} }
} else if (basePath && equals( path, pl, basePath, basePathLen )) { } else if (basePath && equals( path, pl, basePath, basePathLen )) {
// Path nested into Inbox. // Path nested into Inbox.
if (maildir_list_path( gctx, flags, 0 ) < 0) { if (maildir_list_path( ctx, flags, 0 ) < 0) {
closedir( dir ); closedir( dir );
return -1; return -1;
} }
@ -439,10 +441,10 @@ maildir_list_recurse( store_t *gctx, int isBox, int flags,
path[pl++] = '/'; path[pl++] = '/';
nfsnprintf( path + pl, _POSIX_PATH_MAX - pl, "cur" ); nfsnprintf( path + pl, _POSIX_PATH_MAX - pl, "cur" );
if (!stat( path, &st ) && S_ISDIR(st.st_mode)) if (!stat( path, &st ) && S_ISDIR(st.st_mode))
add_string_list( &gctx->boxes, name ); add_string_list( &ctx->boxes, name );
path[pl] = 0; path[pl] = 0;
name[nl++] = '/'; name[nl++] = '/';
if (maildir_list_recurse( gctx, isBox + 1, flags, inbox, inboxLen, basePath, basePathLen, path, pl, name, nl ) < 0) { if (maildir_list_recurse( ctx, isBox + 1, flags, inbox, inboxLen, basePath, basePathLen, path, pl, name, nl ) < 0) {
closedir( dir ); closedir( dir );
return -1; return -1;
} }
@ -453,55 +455,55 @@ maildir_list_recurse( store_t *gctx, int isBox, int flags,
} }
static int static int
maildir_list_inbox( store_t *gctx, int flags, const char *basePath ) maildir_list_inbox( maildir_store_t *ctx, int flags, const char *basePath )
{ {
char path[_POSIX_PATH_MAX], name[_POSIX_PATH_MAX]; char path[_POSIX_PATH_MAX], name[_POSIX_PATH_MAX];
if (gctx->listed & LIST_INBOX) if (ctx->listed & LIST_INBOX)
return 0; return 0;
gctx->listed |= LIST_INBOX; ctx->listed |= LIST_INBOX;
add_string_list( &gctx->boxes, "INBOX" ); add_string_list( &ctx->boxes, "INBOX" );
return maildir_list_recurse( return maildir_list_recurse(
gctx, 1, flags, 0, 0, basePath, basePath ? strlen( basePath ) - 1 : 0, ctx, 1, flags, 0, 0, basePath, basePath ? strlen( basePath ) - 1 : 0,
path, nfsnprintf( path, _POSIX_PATH_MAX, "%s/", ((maildir_store_conf_t *)gctx->conf)->inbox ), path, nfsnprintf( path, _POSIX_PATH_MAX, "%s/", ((maildir_store_conf_t *)ctx->gen.conf)->inbox ),
name, nfsnprintf( name, _POSIX_PATH_MAX, "INBOX/" ) ); name, nfsnprintf( name, _POSIX_PATH_MAX, "INBOX/" ) );
} }
static int static int
maildir_list_path( store_t *gctx, int flags, const char *inbox ) maildir_list_path( maildir_store_t *ctx, int flags, const char *inbox )
{ {
char path[_POSIX_PATH_MAX], name[_POSIX_PATH_MAX]; char path[_POSIX_PATH_MAX], name[_POSIX_PATH_MAX];
if (gctx->listed & LIST_PATH) if (ctx->listed & LIST_PATH)
return 0; return 0;
gctx->listed |= LIST_PATH; ctx->listed |= LIST_PATH;
if (maildir_ensure_path( (maildir_store_conf_t *)gctx->conf ) < 0) if (maildir_ensure_path( (maildir_store_conf_t *)ctx->gen.conf ) < 0)
return -1; return -1;
return maildir_list_recurse( return maildir_list_recurse(
gctx, 0, flags, inbox, inbox ? strlen( inbox ) : 0, 0, 0, ctx, 0, flags, inbox, inbox ? strlen( inbox ) : 0, 0, 0,
path, nfsnprintf( path, _POSIX_PATH_MAX, "%s", gctx->conf->path ), path, nfsnprintf( path, _POSIX_PATH_MAX, "%s", ctx->gen.conf->path ),
name, 0 ); name, 0 );
} }
static void static void
maildir_list_store( store_t *gctx, int flags, maildir_list_store( store_t *gctx, int flags,
void (*cb)( int sts, void *aux ), void *aux ) void (*cb)( int sts, string_list_t *boxes, void *aux ), void *aux )
{ {
maildir_store_t *ctx = (maildir_store_t *)gctx; maildir_store_t *ctx = (maildir_store_t *)gctx;
maildir_store_conf_t *conf = (maildir_store_conf_t *)gctx->conf; maildir_store_conf_t *conf = (maildir_store_conf_t *)gctx->conf;
if (conf->sub_style == SUB_MAILDIRPP if (conf->sub_style == SUB_MAILDIRPP
? maildir_list_maildirpp( gctx, flags, conf->inbox ) < 0 ? maildir_list_maildirpp( ctx, flags, conf->inbox ) < 0
: ((((flags & LIST_PATH) || ((flags & LIST_PATH_MAYBE) && gctx->conf->path)) : ((((flags & LIST_PATH) || ((flags & LIST_PATH_MAYBE) && gctx->conf->path))
&& maildir_list_path( gctx, flags, conf->inbox ) < 0) || && maildir_list_path( ctx, flags, conf->inbox ) < 0) ||
((flags & LIST_INBOX) ((flags & LIST_INBOX)
&& maildir_list_inbox( gctx, flags, gctx->conf->path ) < 0))) { && maildir_list_inbox( ctx, flags, gctx->conf->path ) < 0))) {
maildir_invoke_bad_callback( ctx ); maildir_invoke_bad_callback( ctx );
cb( DRV_CANCELED, aux ); cb( DRV_CANCELED, 0, aux );
} else { } else {
cb( DRV_OK, aux ); cb( DRV_OK, ctx->boxes, aux );
} }
} }

5
src/main.c
Unescape View File

@ -775,7 +775,7 @@ store_bad( void *aux )
} }
static void store_connected( int sts, void *aux ); static void store_connected( int sts, void *aux );
static void store_listed( int sts, void *aux ); static void store_listed( int sts, string_list_t *boxes, void *aux );
static int sync_listed_boxes( main_vars_t *mvars, box_ent_t *mbox ); static int sync_listed_boxes( main_vars_t *mvars, box_ent_t *mbox );
static void done_sync_2_dyn( int sts, void *aux ); static void done_sync_2_dyn( int sts, void *aux );
static void done_sync( int sts, void *aux ); static void done_sync( int sts, void *aux );
@ -999,10 +999,9 @@ store_connected( int sts, void *aux )
} }
static void static void
store_listed( int sts, void *aux ) store_listed( int sts, string_list_t *boxes, void *aux )
{ {
MVARS(aux) MVARS(aux)
string_list_t *boxes = mvars->ctx[t]->boxes;
string_list_t *box; string_list_t *box;
switch (sts) { switch (sts) {

Write Preview
Loading…
Cancel
Save