lib-network

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

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 318fbdf..e462a6a 100644 (file)
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -21,7 +21,7 @@
 #include "url.h"
 #include "pop.h"
 #if defined (USE_SSL) || defined (USE_GNUTLS)
-# include "mutt_ssl.h"
+# include <lib-network/mutt_ssl.h>
 #endif
 
 #include "lib/debug.h"
@@ -67,16 +67,14 @@ void pop_error (POP_DATA * pop_data, char *msg)
   t = strchr (pop_data->err_msg, '\0');
   c = msg;
 
-  if (!str_ncmp (msg, "-ERR ", 5)) {
-    c2 = msg + 5;
-    SKIPWS (c2);
-
+  if (!m_strncmp(msg, "-ERR ", 5)) {
+    c2 = vskipspaces(msg + 5);
     if (*c2)
       c = c2;
   }
 
-  strfcpy (t, c, sizeof (pop_data->err_msg) - strlen (pop_data->err_msg));
-  str_skip_trailws (pop_data->err_msg);
+  m_strcpy(t, sizeof(pop_data->err_msg) - strlen(pop_data->err_msg), c);
+  m_strrtrim(pop_data->err_msg);
 }
 
 /* Parse CAPA output */
@@ -87,8 +85,7 @@ static int fetch_capa (char *line, void *data)
 
   if (!ascii_strncasecmp (line, "SASL", 4)) {
     p_delete(&pop_data->auth_list);
-    c = line + 4;
-    SKIPWS (c);
+    c = vskipspaces(line + 4);
     pop_data->auth_list = m_strdup(c);
   }
 
@@ -153,7 +150,7 @@ static pop_query_status pop_capabilities (POP_DATA * pop_data, int mode)
 
   /* Execute CAPA command */
   if (mode == 0 || pop_data->cmd_capa != CMD_NOT_AVAILABLE) {
-    strfcpy (buf, "CAPA\r\n", sizeof (buf));
+    m_strcpy(buf, sizeof(buf), "CAPA\r\n");
     switch (pop_fetch_data (pop_data, buf, NULL, fetch_capa, pop_data)) {
     case PQ_OK:
       {
@@ -177,7 +174,7 @@ static pop_query_status pop_capabilities (POP_DATA * pop_data, int mode)
     pop_data->cmd_uidl = CMD_UNKNOWN;
     pop_data->cmd_top = CMD_UNKNOWN;
 
-    strfcpy (buf, "AUTH\r\n", sizeof (buf));
+    m_strcpy(buf, sizeof(buf), "AUTH\r\n");
     if (pop_fetch_data (pop_data, buf, NULL, fetch_auth, pop_data) == PQ_NOT_CONNECTED)
       return PQ_NOT_CONNECTED;
   }
@@ -222,7 +219,7 @@ pop_query_status pop_connect (POP_DATA * pop_data)
 
   pop_data->status = POP_CONNECTED;
 
-  if (str_ncmp (buf, "+OK", 3)) {
+  if (m_strncmp(buf, "+OK", 3)) {
     *pop_data->err_msg = '\0';
     pop_error (pop_data, buf);
     mutt_error ("%s", pop_data->err_msg);
@@ -276,7 +273,7 @@ pop_query_status pop_open_connection (POP_DATA * pop_data)
         pop_data->use_stls = 2;
     }
     if (pop_data->use_stls == 2) {
-      strfcpy (buf, "STLS\r\n", sizeof (buf));
+      m_strcpy(buf, sizeof(buf), "STLS\r\n");
       ret = pop_query (pop_data, buf, sizeof (buf));
       if (ret == PQ_NOT_CONNECTED)
         goto err_conn;
@@ -330,7 +327,7 @@ pop_query_status pop_open_connection (POP_DATA * pop_data)
   }
 
   /* get total size of mailbox */
-  strfcpy (buf, "STAT\r\n", sizeof (buf));
+  m_strcpy(buf, sizeof(buf), "STAT\r\n");
   ret = pop_query (pop_data, buf, sizeof (buf));
   if (ret == PQ_NOT_CONNECTED)
     goto err_conn;
@@ -363,12 +360,12 @@ void pop_logout (CONTEXT * ctx)
     mutt_message _("Closing connection to POP server...");
 
     if (ctx->readonly) {
-      strfcpy (buf, "RSET\r\n", sizeof (buf));
+      m_strcpy(buf, sizeof(buf), "RSET\r\n");
       ret = pop_query (pop_data, buf, sizeof (buf));
     }
 
     if (ret != PQ_NOT_CONNECTED) {
-      strfcpy (buf, "QUIT\r\n", sizeof (buf));
+      m_strcpy(buf, sizeof(buf), "QUIT\r\n");
       pop_query (pop_data, buf, sizeof (buf));
     }
 
@@ -411,7 +408,7 @@ pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, con
     pop_data->status = POP_DISCONNECTED;
     return PQ_NOT_CONNECTED;
   }
-  if (!str_ncmp (buf, "+OK", 3))
+  if (!m_strncmp(buf, "+OK", 3))
     return PQ_OK;
 
   pop_error (pop_data, buf);
@@ -438,14 +435,14 @@ pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progres
   long pos = 0;
   size_t lenbuf = 0;
 
-  strfcpy (buf, query, sizeof (buf));
+  m_strcpy(buf, sizeof(buf), query);
   ret = pop_query (pop_data, buf, sizeof (buf));
   if (ret != PQ_OK)
     return ret;
 
   inbuf = p_new(char, sizeof(buf));
 
-  FOREVER {
+  for (;;) {
     chunk =
       mutt_socket_readln_d (buf, sizeof (buf), pop_data->conn,
                             M_SOCK_LOG_HDR);
@@ -462,7 +459,7 @@ pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progres
       p++;
     }
 
-    strfcpy(inbuf + lenbuf, p, sizeof(buf));
+    m_strcpy(inbuf + lenbuf,sizeof(buf), p);
     pos += chunk;
 
     if (chunk >= sizeof (buf)) {
@@ -492,7 +489,7 @@ static int check_uidl (char *line, void *data)
 
   sscanf (line, "%u %s", &index, line);
   for (i = 0; i < ctx->msgcount; i++) {
-    if (!str_cmp (ctx->hdrs[i]->data, line)) {
+    if (!m_strcmp(ctx->hdrs[i]->data, line)) {
       ctx->hdrs[i]->refno = index;
       break;
     }
@@ -513,7 +510,7 @@ pop_query_status pop_reconnect (CONTEXT * ctx)
   if (pop_data->status == POP_BYE)
     return PQ_NOT_CONNECTED;
 
-  FOREVER {
+  for (;;) {
     mutt_socket_close (pop_data->conn);
 
     ret = pop_open_connection (pop_data);