X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop_auth.c;h=fdea7c325480d9c63678a470d9f137f1df20cdfe;hb=344312314eec327c3bf47f86950a5ad6c616e031;hp=2e8bd21e2b9c685d68c79f3dcab0ba5db1aef0c5;hpb=ecaab35b973fbceb58b5ed174971c82762cc0199;p=apps%2Fmadmutt.git

diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index 2e8bd21..fdea7c3 100644
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -14,10 +14,10 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
+#include <lib-hash/hash.h>
 
 #include "mutt.h"
 #include "mx.h"
-#include "md5.h"
 #include "pop.h"
 
 #include "lib/debug.h"
@@ -56,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);
@@ -81,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);
@@ -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
@@ -104,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;
@@ -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;