X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop_auth.c;h=5dc846d4ba9a945ff7ebf88012c42ab0db116d38;hb=d9960a434f5c00a534a0dabe02ae5ab8d4881569;hp=08d3183b9e3d5221dcb3e3867533084c9db4c49d;hpb=617e7d83d14e14e6a520a48e75437211b16c8834;p=apps%2Fmadmutt.git

diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index 08d3183..5dc846d 100644
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -12,14 +12,14 @@
 #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/intl.h"
 #include "lib/debug.h"
 
 #include <string.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,7 +81,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
   olen = strlen (buf);
 
   /* looping protocol */
-  FOREVER {
+  for (;;) {
     strfcpy (buf + olen, "\r\n", sizeof (buf) - olen);
     mutt_socket_write (pop_data->conn, buf);
     if (mutt_socket_readln (inbuf, sizeof (inbuf), pop_data->conn) < 0) {
@@ -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;
@@ -166,7 +166,7 @@ void pop_apop_timestamp (POP_DATA * pop_data, char *buf)
 
   if ((p1 = strchr (buf, '<')) && (p2 = strchr (p1, '>'))) {
     p2[1] = '\0';
-    pop_data->timestamp = str_dup (p1);
+    pop_data->timestamp = m_strdup(p1);
   }
 }
 
@@ -305,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) {