generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

imap: Adjusted SELECT and FETCH function order

Browse Source 
Moved imap_select() and imap_fetch() to be grouped with the other
perform functions.
This commit is contained in:
Jiri Hruska 2013-02-25 18:06:02 +01:00 committed by Steve Holme
parent 6f02209cc8
commit a360944ed6
1 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
lib/imap.c
View File

@ -679,6 +679,54 @@ static CURLcode imap_authenticate(struct connectdata *conn)
return result; return result;
} }
/* Start the DO phase */
static CURLcode imap_select(struct connectdata *conn)
{
CURLcode result = CURLE_OK;
struct SessionHandle *data = conn->data;
struct IMAP *imap = data->state.proto.imap;
char *mailbox;
mailbox = imap_atom(imap->mailbox ? imap->mailbox : "");
if(!mailbox)
result = CURLE_OUT_OF_MEMORY;
else
result = imap_sendf(conn, "SELECT %s", mailbox);
Curl_safefree(mailbox);
if(result)
return result;
state(conn, IMAP_SELECT);
return result;
}
static CURLcode imap_fetch(struct connectdata *conn)
{
CURLcode result = CURLE_OK;
struct IMAP *imap = conn->data->state.proto.imap;
/* Send the FETCH command */
result = imap_sendf(conn, "FETCH %s BODY[%s]",
imap->uid ? imap->uid : "1",
imap->section ? imap->section : "");
if(result)
return result;
/*
* When issued, the server will respond with a single line similar to
* '* 1 FETCH (BODY[TEXT] {2021}'
*
* Identifying the fetch and how many bytes of contents we can expect. We
* must extract that number before continuing to "download as usual".
*/
state(conn, IMAP_FETCH);
return result;
}
/* For the initial server greeting */ /* For the initial server greeting */
static CURLcode imap_state_servergreet_resp(struct connectdata *conn, static CURLcode imap_state_servergreet_resp(struct connectdata *conn,
int imapcode, int imapcode,
@ -1110,54 +1158,6 @@ static CURLcode imap_state_login_resp(struct connectdata *conn,
return result; return result;
} }
/* Start the DO phase */
static CURLcode imap_select(struct connectdata *conn)
{
CURLcode result = CURLE_OK;
struct SessionHandle *data = conn->data;
struct IMAP *imap = data->state.proto.imap;
char *mailbox;
mailbox = imap_atom(imap->mailbox ? imap->mailbox : "");
if(!mailbox)
result = CURLE_OUT_OF_MEMORY;
else
result = imap_sendf(conn, "SELECT %s", mailbox);
Curl_safefree(mailbox);
if(result)
return result;
state(conn, IMAP_SELECT);
return result;
}
static CURLcode imap_fetch(struct connectdata *conn)
{
CURLcode result = CURLE_OK;
struct IMAP *imap = conn->data->state.proto.imap;
/* Send the FETCH command */
result = imap_sendf(conn, "FETCH %s BODY[%s]",
imap->uid ? imap->uid : "1",
imap->section ? imap->section : "");
if(result)
return result;
/*
* When issued, the server will respond with a single line similar to
* '* 1 FETCH (BODY[TEXT] {2021}'
*
* Identifying the fetch and how many bytes of contents we can expect. We
* must extract that number before continuing to "download as usual".
*/
state(conn, IMAP_FETCH);
return result;
}
/* For SELECT responses */ /* For SELECT responses */
static CURLcode imap_state_select_resp(struct connectdata *conn, static CURLcode imap_state_select_resp(struct connectdata *conn,
int imapcode, int imapcode,