#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include <lib-hash/hash.h>
+#include <lib-lib/debug.h>
#include "mutt.h"
#include "mx.h"
#include "pop.h"
-#include "lib/debug.h"
#include <string.h>
#include <unistd.h>
/* looping protocol */
for (;;) {
- strfcpy (buf + olen, "\r\n", sizeof (buf) - olen);
+ m_strcpy(buf + olen, sizeof(buf) - olen, "\r\n");
mutt_socket_write (pop_data->conn, buf);
if (mutt_socket_readln (inbuf, sizeof (inbuf), pop_data->conn) < 0) {
sasl_dispose (&saslconn);
strlen (pop_data->conn->account.pass));
MD5Final (digest, &mdContext);
- for (i = 0; i < sizeof (digest); i++)
+ for (i = 0; i < ssizeof(digest); i++)
sprintf (hash + 2 * i, "%02x", digest[i]);
/* Send APOP command to server */
- snprintf (buf, sizeof (buf), "APOP %s %s\r\n", pop_data->conn->account.user,
- hash);
+ snprintf(buf, sizeof(buf), "APOP %s %s\r\n", pop_data->conn->account.user,
+ hash);
switch (pop_query (pop_data, buf, sizeof (buf))) {
case PQ_OK:
*/
pop_query_status pop_authenticate (POP_DATA * pop_data)
{
- ACCOUNT *acct = &pop_data->conn->account;
+ ACCOUNT *act = &pop_data->conn->account;
pop_auth_t *authenticator;
char *methods;
char *comma;
int attempts = 0;
int ret = POP_A_UNAVAIL;
- if (mutt_account_getuser (acct) || !acct->user[0] ||
- mutt_account_getpass (acct) || !acct->pass[0])
+ if (mutt_account_getuser (act) || !act->user[0] ||
+ mutt_account_getpass (act) || !act->pass[0])
return PFD_FUNCT_ERROR;
if (PopAuthenticators && *PopAuthenticators) {