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

allow the mailbox names in LIST responses to be literals

Browse Source 
Lotus Domino seems to send them like that.
This commit is contained in:
Oswald Buddenhagen 2013-07-27 15:32:49 +02:00
parent fc77feacc5
commit a0dc37339e
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/drv_imap.c
View File

@ -879,12 +879,13 @@ parse_response_code( imap_store_t *ctx, struct imap_cmd *cmd, char *s )
return RESP_OK; return RESP_OK;
} }
static int parse_list_rsp_p2( imap_store_t *, list_t *, char * );
static int static int
parse_list_rsp( imap_store_t *ctx, list_t *list, char *cmd ) parse_list_rsp( imap_store_t *ctx, list_t *list, char *cmd )
{ {
char *arg; char *arg;
list_t *lp; list_t *lp;
int l;
if (!list) { if (!list) {
error( "IMAP error: malformed LIST response\n" ); error( "IMAP error: malformed LIST response\n" );
@ -900,25 +901,41 @@ parse_list_rsp( imap_store_t *ctx, list_t *list, char *cmd )
arg = next_arg( &cmd ); arg = next_arg( &cmd );
if (!ctx->delimiter) if (!ctx->delimiter)
ctx->delimiter = *arg; ctx->delimiter = *arg;
arg = next_arg( &cmd ); return parse_list( ctx, cmd, parse_list_rsp_p2 );
}
static int
parse_list_rsp_p2( imap_store_t *ctx, list_t *list, char *cmd ATTR_UNUSED )
{
char *arg;
int l;
if (!is_atom( list )) {
error( "IMAP error: malformed LIST response\n" );
free_list( list );
return LIST_BAD;
}
arg = list->val;
if (memcmp( arg, "INBOX", 5 ) || (arg[5] && arg[5] != ctx->delimiter)) { if (memcmp( arg, "INBOX", 5 ) || (arg[5] && arg[5] != ctx->delimiter)) {
l = strlen( ctx->gen.conf->path ); l = strlen( ctx->gen.conf->path );
if (memcmp( arg, ctx->gen.conf->path, l )) if (memcmp( arg, ctx->gen.conf->path, l ))
return LIST_OK; goto skip;
arg += l; arg += l;
if (!memcmp( arg, "INBOX", 5 ) && (!arg[5] || arg[5] == ctx->delimiter)) { if (!memcmp( arg, "INBOX", 5 ) && (!arg[5] || arg[5] == ctx->delimiter)) {
if (!arg[5]) if (!arg[5])
warn( "IMAP warning: ignoring INBOX in %s\n", ctx->gen.conf->path ); warn( "IMAP warning: ignoring INBOX in %s\n", ctx->gen.conf->path );
return LIST_OK; goto skip;
} }
} }
if (!memcmp( arg + strlen( arg ) - 5, ".lock", 5 )) /* workaround broken servers */ if (!memcmp( arg + strlen( arg ) - 5, ".lock", 5 )) /* workaround broken servers */
return LIST_OK; goto skip;
if (map_name( arg, ctx->delimiter, '/') < 0) { if (map_name( arg, ctx->delimiter, '/') < 0) {
warn( "IMAP warning: ignoring mailbox %s (reserved character '/' in name)\n", arg ); warn( "IMAP warning: ignoring mailbox %s (reserved character '/' in name)\n", arg );
return LIST_OK; goto skip;
} }
add_string_list( &ctx->gen.boxes, arg ); add_string_list( &ctx->gen.boxes, arg );
skip:
free_list( list );
return LIST_OK; return LIST_OK;
} }