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

fix UIDNEXT handling

Browse Source 
UIDNEXT *can* be legally zero, so deal with it.

-REFMAIL: 4CA62BA1.4020104@lemma.co.uk
This commit is contained in:
Oswald Buddenhagen 2010-10-03 14:25:59 +02:00
parent 2d5a73c55d
commit 1af2cfde4f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drv_imap.c
View File

@ -836,7 +836,7 @@ parse_response_code( imap_store_t *ctx, struct imap_cmd_cb *cb, char *s )
return RESP_BAD; return RESP_BAD;
} }
} else if (!strcmp( "UIDNEXT", arg )) { } else if (!strcmp( "UIDNEXT", arg )) {
if (!(arg = next_arg( &s )) || !(imap->uidnext = atoi( arg ))) { if (!(arg = next_arg( &s )) || (imap->uidnext = strtol( arg, &p, 10 ), *p)) {
fprintf( stderr, "IMAP error: malformed NEXTUID status\n" ); fprintf( stderr, "IMAP error: malformed NEXTUID status\n" );
return RESP_BAD; return RESP_BAD;
} }
@ -1437,6 +1437,8 @@ imap_select( store_t *gctx, int minuid, int maxuid, int *excs, int nexcs )
prefix = ctx->prefix; prefix = ctx->prefix;
} }
imap->uidnext = -1;
memset( &cb, 0, sizeof(cb) ); memset( &cb, 0, sizeof(cb) );
cb.create = (gctx->opts & OPEN_CREATE) != 0; cb.create = (gctx->opts & OPEN_CREATE) != 0;
cb.trycreate = 1; cb.trycreate = 1;
@ -1462,7 +1464,7 @@ imap_select( store_t *gctx, int minuid, int maxuid, int *excs, int nexcs )
goto bail; goto bail;
} }
if (maxuid == INT_MAX) if (maxuid == INT_MAX)
maxuid = imap->uidnext ? imap->uidnext - 1 : 1000000000; maxuid = imap->uidnext >= 0 ? imap->uidnext - 1 : 1000000000;
if (maxuid >= minuid && if (maxuid >= minuid &&
(ret = imap_exec_b( ctx, 0, "UID FETCH %d:%d (UID%s%s)", minuid, maxuid, (ret = imap_exec_b( ctx, 0, "UID FETCH %d:%d (UID%s%s)", minuid, maxuid,
(gctx->opts & OPEN_FLAGS) ? " FLAGS" : "", (gctx->opts & OPEN_FLAGS) ? " FLAGS" : "",