PROTOPT_CLOSEACTION | PROTOPT_NOURLQUERY /* flags */
};
-
#ifdef USE_SSL
/*
* POP3S protocol handler.
PROTOPT_NONE /* flags */
};
-
#ifdef USE_SSL
/*
* HTTP-proxyed POP3S protocol handler.
#endif
#endif
-
/* function that checks for a pop3 status code at the start of the given
string */
static int pop3_endofresp(struct pingpong *pp,
if(((len >= 3) && !memcmp("+OK", line, 3)) ||
((len >= 4) && !memcmp("-ERR", line, 4))) {
- *resp=line[1]; /* O or E */
+ *resp = line[1]; /* O or E */
return TRUE;
}
{
CURLcode result = CURLE_OK;
struct SessionHandle *data = conn->data;
+
(void)instate; /* no use for this yet */
if(pop3code != 'O') {
return result;
}
-/* for the retr response */
-static CURLcode pop3_state_retr_resp(struct connectdata *conn,
+/* for the list response */
+static CURLcode pop3_state_list_resp(struct connectdata *conn,
int pop3code,
pop3state instate)
{
return CURLE_RECV_ERROR;
}
+ /* This 'OK' line ends with a CR LF pair which is the two first bytes of the
+ EOB string so count this is two matching bytes. This is necessary to make
+ the code detect the EOB if the only data than comes now is %2e CR LF like
+ when there is no body to return. */
+ pop3c->eob = 2;
+
+ /* But since this initial CR LF pair is not part of the actual body, we set
+ the strip counter here so that these bytes won't be delivered. */
+ pop3c->strip = 2;
+
/* POP3 download */
Curl_setup_transfer(conn, FIRSTSOCKET, -1, FALSE, pop3->bytecountp,
-1, NULL); /* no upload here */
if(pp->cache) {
- /* The header "cache" contains a bunch of data that is actually body
- content so send it as such. Note that there may even be additional
- "headers" after the body */
+ /* The header "cache" contains a bunch of data that is actually list data
+ so send it as such */
if(!data->set.opt_no_body) {
result = Curl_pop3_write(conn, pp->cache, pp->cache_size);
return result;
}
-/* for the list response */
-static CURLcode pop3_state_list_resp(struct connectdata *conn,
+/* for LIST response with a given message */
+static CURLcode pop3_state_list_single_resp(struct connectdata *conn,
+ int pop3code,
+ pop3state instate)
+{
+ CURLcode result = CURLE_OK;
+ struct SessionHandle *data = conn->data;
+
+ (void)instate; /* no use for this yet */
+
+ if(pop3code != 'O') {
+ failf(data, "Invalid message. %c", pop3code);
+ result = CURLE_REMOTE_FILE_NOT_FOUND;
+ }
+
+ state(conn, POP3_STOP);
+
+ return result;
+}
+
+/* for the retr response */
+static CURLcode pop3_state_retr_resp(struct connectdata *conn,
int pop3code,
pop3state instate)
{
return CURLE_RECV_ERROR;
}
- /* This 'OK' line ends with a CR LF pair which is the two first bytes of the
- EOB string so count this is two matching bytes. This is necessary to make
- the code detect the EOB if the only data than comes now is %2e CR LF like
- when there is no body to return. */
- pop3c->eob = 2;
-
- /* But since this initial CR LF pair is not part of the actual body, we set
- the strip counter here so that these bytes won't be delivered. */
- pop3c->strip = 2;
-
/* POP3 download */
Curl_setup_transfer(conn, FIRSTSOCKET, -1, FALSE, pop3->bytecountp,
-1, NULL); /* no upload here */
if(pp->cache) {
- /* The header "cache" contains a bunch of data that is actually list data
- so send it as such */
+ /* The header "cache" contains a bunch of data that is actually body
+ content so send it as such. Note that there may even be additional
+ "headers" after the body */
if(!data->set.opt_no_body) {
result = Curl_pop3_write(conn, pp->cache, pp->cache_size);
return result;
}
-/* for LIST response with a given message */
-static CURLcode pop3_state_list_single_resp(struct connectdata *conn,
- int pop3code,
- pop3state instate)
+/* start the DO phase for LIST */
+static CURLcode pop3_list(struct connectdata *conn)
{
CURLcode result = CURLE_OK;
- struct SessionHandle *data = conn->data;
- (void)instate; /* no use for this yet */
+ struct pop3_conn *pop3c = &conn->proto.pop3c;
- if(pop3code != 'O') {
- failf(data, "Invalid message. %c", pop3code);
- result = CURLE_REMOTE_FILE_NOT_FOUND;
- }
+ if(pop3c->mailbox[0] != '\0')
+ result = Curl_pp_sendf(&conn->proto.pop3c.pp, "LIST %s", pop3c->mailbox);
+ else
+ result = Curl_pp_sendf(&conn->proto.pop3c.pp, "LIST");
+ if(result)
+ return result;
+
+ if(pop3c->mailbox[0] != '\0')
+ state(conn, POP3_LIST_SINGLE);
+ else
+ state(conn, POP3_LIST);
- state(conn, POP3_STOP);
return result;
}
return result;
state(conn, POP3_RETR);
- return result;
-}
-
-/* start the DO phase for LIST */
-static CURLcode pop3_list(struct connectdata *conn)
-{
- CURLcode result = CURLE_OK;
- struct pop3_conn *pop3c = &conn->proto.pop3c;
- if(pop3c->mailbox[0] != '\0')
- result = Curl_pp_sendf(&conn->proto.pop3c.pp, "LIST %s", pop3c->mailbox);
- else
- result = Curl_pp_sendf(&conn->proto.pop3c.pp, "LIST");
- if(result)
- return result;
-
- if(pop3c->mailbox[0] != '\0')
- state(conn, POP3_LIST_SINGLE);
- else
- state(conn, POP3_LIST);
return result;
}
result = pop3_state_starttls_resp(conn, pop3code, pop3c->state);
break;
- case POP3_RETR:
- result = pop3_state_retr_resp(conn, pop3code, pop3c->state);
- break;
-
case POP3_LIST:
result = pop3_state_list_resp(conn, pop3code, pop3c->state);
break;
result = pop3_state_list_single_resp(conn, pop3code, pop3c->state);
break;
+ case POP3_RETR:
+ result = pop3_state_retr_resp(conn, pop3code, pop3c->state);
+ break;
+
case POP3_QUIT:
/* fallthrough, just stop! */
default:
* a part of the easy interface, it will always be TRUE.
*/
static CURLcode pop3_connect(struct connectdata *conn,
- bool *done) /* see description above */
+ bool *done) /* see description above */
{
CURLcode result;
struct pop3_conn *pop3c = &conn->proto.pop3c;
struct SessionHandle *data = conn->data;
struct FTP *pop3 = data->state.proto.pop3;
struct pop3_conn *pop3c = &conn->proto.pop3c;
- CURLcode result=CURLE_OK;
+ CURLcode result = CURLE_OK;
+
(void)premature;
if(!pop3)
}
Curl_safefree(pop3c->mailbox);
- pop3c->mailbox = NULL;
/* Clear the transfer mode for the next connection */
pop3->transfer = FTPTRANSFER_BODY;
result = Curl_pp_sendf(&conn->proto.pop3c.pp, "QUIT", NULL);
if(result)
return result;
+
state(conn, POP3_QUIT);
result = pop3_easy_statemach(conn);
if(!dead_connection && pop3c->pp.conn)
(void)pop3_quit(conn); /* ignore errors on the LOGOUT */
-
Curl_pp_disconnect(&pop3c->pp);
return CURLE_OK;
DEBUGF(infof(conn->data, "DO phase is complete\n"));
}
+
return result;
}
* remote host.
*
*/
-static
-CURLcode pop3_regular_transfer(struct connectdata *conn,
- bool *dophase_done)
+static CURLcode pop3_regular_transfer(struct connectdata *conn,
+ bool *dophase_done)
{
CURLcode result=CURLE_OK;
bool connected=FALSE;
projects / curl / commitdiff