aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/pop3.c14
-rw-r--r--lib/pop3.h2
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/pop3.c b/lib/pop3.c
index 04290f201..acdb65f0d 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -1058,10 +1058,10 @@ static CURLcode pop3_command(struct connectdata *conn)
const char *command = NULL;
/* Calculate the default command */
- if(pop3->mailbox[0] == '\0' || conn->data->set.ftp_list_only) {
+ if(pop3->id[0] == '\0' || conn->data->set.ftp_list_only) {
command = "LIST";
- if(pop3->mailbox[0] != '\0')
+ if(pop3->id[0] != '\0')
/* Message specific LIST so skip the BODY transfer */
pop3->transfer = FTPTRANSFER_INFO;
}
@@ -1069,10 +1069,10 @@ static CURLcode pop3_command(struct connectdata *conn)
command = "RETR";
/* Send the command */
- if(pop3->mailbox[0] != '\0')
+ if(pop3->id[0] != '\0')
result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s %s",
(pop3->custom && pop3->custom[0] != '\0' ?
- pop3->custom : command), pop3->mailbox);
+ pop3->custom : command), pop3->id);
else
result = Curl_pp_sendf(&conn->proto.pop3c.pp,
(pop3->custom && pop3->custom[0] != '\0' ?
@@ -1386,7 +1386,7 @@ static CURLcode pop3_done(struct connectdata *conn, CURLcode status,
}
/* Cleanup our per-request based variables */
- Curl_safefree(pop3->mailbox);
+ Curl_safefree(pop3->id);
Curl_safefree(pop3->custom);
/* Clear the transfer mode for the next request */
@@ -1543,8 +1543,8 @@ static CURLcode pop3_parse_url_path(struct connectdata *conn)
struct POP3 *pop3 = data->state.proto.pop3;
const char *path = data->state.path;
- /* URL decode the path and use this mailbox */
- return Curl_urldecode(data, path, 0, &pop3->mailbox, NULL, TRUE);
+ /* URL decode the path for the message ID */
+ return Curl_urldecode(data, path, 0, &pop3->id, NULL, TRUE);
}
static CURLcode pop3_parse_custom_request(struct connectdata *conn)
diff --git a/lib/pop3.h b/lib/pop3.h
index 05df8bc6f..459a03d7a 100644
--- a/lib/pop3.h
+++ b/lib/pop3.h
@@ -59,7 +59,7 @@ typedef enum {
struct POP3 {
curl_off_t *bytecountp;
curl_pp_transfer transfer;
- char *mailbox; /* Message ID */
+ char *id; /* Message ID */
char *custom; /* Custom Request */
};