projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move parse.c into rfc822parse.c in the lib-mime as it's what it's about
[apps/madmutt.git]
/
pop
/
pop_lib.c
diff --git
a/pop/pop_lib.c
b/pop/pop_lib.c
index
d32bf37
..
fae3c9b
100644
(file)
--- a/
pop/pop_lib.c
+++ b/
pop/pop_lib.c
@@
-68,15
+68,13
@@
void pop_error (POP_DATA * pop_data, char *msg)
c = msg;
if (!m_strncmp(msg, "-ERR ", 5)) {
c = msg;
if (!m_strncmp(msg, "-ERR ", 5)) {
- c2 = msg + 5;
- SKIPWS (c2);
-
+ c2 = vskipspaces(msg + 5);
if (*c2)
c = c2;
}
if (*c2)
c = c2;
}
-
strfcpy (t, c, sizeof (pop_data->err_msg) - strlen (pop_data->err_msg)
);
-
str_skip_trailws
(pop_data->err_msg);
+
m_strcpy(t, sizeof(pop_data->err_msg) - strlen(pop_data->err_msg), c
);
+
m_strrtrim
(pop_data->err_msg);
}
/* Parse CAPA output */
}
/* Parse CAPA output */
@@
-87,8
+85,7
@@
static int fetch_capa (char *line, void *data)
if (!ascii_strncasecmp (line, "SASL", 4)) {
p_delete(&pop_data->auth_list);
if (!ascii_strncasecmp (line, "SASL", 4)) {
p_delete(&pop_data->auth_list);
- c = line + 4;
- SKIPWS (c);
+ c = vskipspaces(line + 4);
pop_data->auth_list = m_strdup(c);
}
pop_data->auth_list = m_strdup(c);
}
@@
-153,7
+150,7
@@
static pop_query_status pop_capabilities (POP_DATA * pop_data, int mode)
/* Execute CAPA command */
if (mode == 0 || pop_data->cmd_capa != CMD_NOT_AVAILABLE) {
/* Execute CAPA command */
if (mode == 0 || pop_data->cmd_capa != CMD_NOT_AVAILABLE) {
-
strfcpy (buf, "CAPA\r\n", sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), "CAPA\r\n"
);
switch (pop_fetch_data (pop_data, buf, NULL, fetch_capa, pop_data)) {
case PQ_OK:
{
switch (pop_fetch_data (pop_data, buf, NULL, fetch_capa, pop_data)) {
case PQ_OK:
{
@@
-177,7
+174,7
@@
static pop_query_status pop_capabilities (POP_DATA * pop_data, int mode)
pop_data->cmd_uidl = CMD_UNKNOWN;
pop_data->cmd_top = CMD_UNKNOWN;
pop_data->cmd_uidl = CMD_UNKNOWN;
pop_data->cmd_top = CMD_UNKNOWN;
-
strfcpy (buf, "AUTH\r\n", sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), "AUTH\r\n"
);
if (pop_fetch_data (pop_data, buf, NULL, fetch_auth, pop_data) == PQ_NOT_CONNECTED)
return PQ_NOT_CONNECTED;
}
if (pop_fetch_data (pop_data, buf, NULL, fetch_auth, pop_data) == PQ_NOT_CONNECTED)
return PQ_NOT_CONNECTED;
}
@@
-276,7
+273,7
@@
pop_query_status pop_open_connection (POP_DATA * pop_data)
pop_data->use_stls = 2;
}
if (pop_data->use_stls == 2) {
pop_data->use_stls = 2;
}
if (pop_data->use_stls == 2) {
-
strfcpy (buf, "STLS\r\n", sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), "STLS\r\n"
);
ret = pop_query (pop_data, buf, sizeof (buf));
if (ret == PQ_NOT_CONNECTED)
goto err_conn;
ret = pop_query (pop_data, buf, sizeof (buf));
if (ret == PQ_NOT_CONNECTED)
goto err_conn;
@@
-330,7
+327,7
@@
pop_query_status pop_open_connection (POP_DATA * pop_data)
}
/* get total size of mailbox */
}
/* get total size of mailbox */
-
strfcpy (buf, "STAT\r\n", sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), "STAT\r\n"
);
ret = pop_query (pop_data, buf, sizeof (buf));
if (ret == PQ_NOT_CONNECTED)
goto err_conn;
ret = pop_query (pop_data, buf, sizeof (buf));
if (ret == PQ_NOT_CONNECTED)
goto err_conn;
@@
-363,12
+360,12
@@
void pop_logout (CONTEXT * ctx)
mutt_message _("Closing connection to POP server...");
if (ctx->readonly) {
mutt_message _("Closing connection to POP server...");
if (ctx->readonly) {
-
strfcpy (buf, "RSET\r\n", sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), "RSET\r\n"
);
ret = pop_query (pop_data, buf, sizeof (buf));
}
if (ret != PQ_NOT_CONNECTED) {
ret = pop_query (pop_data, buf, sizeof (buf));
}
if (ret != PQ_NOT_CONNECTED) {
-
strfcpy (buf, "QUIT\r\n", sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), "QUIT\r\n"
);
pop_query (pop_data, buf, sizeof (buf));
}
pop_query (pop_data, buf, sizeof (buf));
}
@@
-438,7
+435,7
@@
pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progres
long pos = 0;
size_t lenbuf = 0;
long pos = 0;
size_t lenbuf = 0;
-
strfcpy (buf, query, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), query
);
ret = pop_query (pop_data, buf, sizeof (buf));
if (ret != PQ_OK)
return ret;
ret = pop_query (pop_data, buf, sizeof (buf));
if (ret != PQ_OK)
return ret;
@@
-462,7
+459,7
@@
pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progres
p++;
}
p++;
}
-
strfcpy(inbuf + lenbuf, p, sizeof(buf)
);
+
m_strcpy(inbuf + lenbuf,sizeof(buf), p
);
pos += chunk;
if (chunk >= sizeof (buf)) {
pos += chunk;
if (chunk >= sizeof (buf)) {