X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop_auth.c;h=fdea7c325480d9c63678a470d9f137f1df20cdfe;hb=77068dc751e2f57d7c635be4f77fd18f30ae3f0e;hp=75fe93c816a166f624633213a22097659aab923f;hpb=b85f52d2ec4d820ab5c4b577857548bec294bb27;p=apps%2Fmadmutt.git

diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index 75fe93c..fdea7c3 100644
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -11,14 +11,15 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+#include <lib-hash/hash.h>
+
 #include "mutt.h"
-#include "ascii.h"
 #include "mx.h"
-#include "md5.h"
 #include "pop.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
 #include "lib/debug.h"
 
 #include <string.h>
@@ -55,7 +56,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
   if (!method)
     method = pop_data->auth_list;
 
-  FOREVER {
+  for (;;) {
 #ifdef USE_SASL
     rc =
       sasl_client_start (saslconn, method, &interaction, &pc, &olen, &mech);
@@ -80,8 +81,8 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
   olen = strlen (buf);
 
   /* looping protocol */
-  FOREVER {
-    strfcpy (buf + olen, "\r\n", sizeof (buf) - olen);
+  for (;;) {
+    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);
@@ -93,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
@@ -103,7 +104,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
     }
 
     if (!client_start)
-      FOREVER {
+      for (;;) {
       rc = sasl_client_step (saslconn, buf, len, &interaction, &pc, &olen);
       if (rc != SASL_INTERACT)
         break;
@@ -125,7 +126,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
       /* sasl_client_st(art|ep) allocate pc with malloc, expect me to 
        * free it */
 #ifndef USE_SASL
-      mem_free (&pc);
+      p_delete(&pc);
 #endif
     }
   }
@@ -133,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;
   }
@@ -142,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;
@@ -161,11 +162,11 @@ void pop_apop_timestamp (POP_DATA * pop_data, char *buf)
 {
   char *p1, *p2;
 
-  mem_free (&pop_data->timestamp);
+  p_delete(&pop_data->timestamp);
 
   if ((p1 = strchr (buf, '<')) && (p2 = strchr (p1, '>'))) {
     p2[1] = '\0';
-    pop_data->timestamp = str_dup (p1);
+    pop_data->timestamp = m_strdup(p1);
   }
 }
 
@@ -278,7 +279,7 @@ static pop_auth_t pop_authenticators[] = {
 #endif
   {pop_auth_apop, "apop"},
   {pop_auth_user, "user"},
-  {NULL}
+  {NULL, NULL}
 };
 
 /*
@@ -304,7 +305,7 @@ pop_query_status pop_authenticate (POP_DATA * pop_data)
 
   if (PopAuthenticators && *PopAuthenticators) {
     /* Try user-specified list of authentication methods */
-    methods = str_dup (PopAuthenticators);
+    methods = m_strdup(PopAuthenticators);
     method = methods;
 
     while (method) {
@@ -343,7 +344,7 @@ pop_query_status pop_authenticate (POP_DATA * pop_data)
       method = comma;
     }
 
-    mem_free (&methods);
+    p_delete(&methods);
   }
   else {
     /* Fall back to default: any authenticator */