Fix a compilation error with gdbm

[apps/madmutt.git] / pop / pop_auth.c

diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index 5dc846d..878c20f 100644 (file)
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -15,12 +15,12 @@
 #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>
@@ -82,7 +82,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
 
   /* 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);
@@ -94,7 +94,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
       break;
 
 #ifdef USE_SASL
-    if (!str_ncmp (inbuf, "+ ", 2)
+    if (!m_strncmp(inbuf, "+ ", 2)
         && sasl_decode64 (inbuf, strlen (inbuf), buf, LONG_STRING - 1,
                           &len) != SASL_OK)
 #endif
@@ -134,7 +134,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
   if (rc != SASL_OK)
     goto bail;
 
-  if (!str_ncmp (inbuf, "+OK", 3)) {
+  if (!m_strncmp(inbuf, "+OK", 3)) {
     mutt_sasl_setup_conn (pop_data->conn, saslconn);
     return POP_A_SUCCESS;
   }
@@ -143,7 +143,7 @@ bail:
   sasl_dispose (&saslconn);
 
   /* terminate SASL sessoin if the last responce is not +OK nor -ERR */
-  if (!str_ncmp (inbuf, "+ ", 2)) {
+  if (!m_strncmp(inbuf, "+ ", 2)) {
     snprintf (buf, sizeof (buf), "*\r\n");
     if (pop_query (pop_data, buf, sizeof (buf)) == PQ_NOT_CONNECTED)
       return POP_A_SOCKET;
@@ -192,12 +192,12 @@ static pop_auth_res_t pop_auth_apop (POP_DATA * pop_data, const char *method)
              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:
@@ -291,7 +291,7 @@ static pop_auth_t pop_authenticators[] = {
 */
 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;
@@ -299,8 +299,8 @@ pop_query_status pop_authenticate (POP_DATA * pop_data)
   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) {