X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop_lib.c;h=763dffc3051ed1bd8d8be82ce803a3604cf48adc;hb=207c707f2c7073a6fbd14124197a559d9d471f65;hp=285ed449798d5f091cc6f140896ae990cf6d54ca;hpb=eed5352e46df93f8921d2e6dfdc95b027bad6e1e;p=apps%2Fmadmutt.git

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 285ed44..763dffc 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -67,7 +67,7 @@ void pop_error (POP_DATA * pop_data, char *msg)
   t = strchr (pop_data->err_msg, '\0');
   c = msg;
 
-  if (!str_ncmp (msg, "-ERR ", 5)) {
+  if (!m_strncmp(msg, "-ERR ", 5)) {
     c2 = msg + 5;
     SKIPWS (c2);
 
@@ -75,7 +75,7 @@ void pop_error (POP_DATA * pop_data, char *msg)
       c = c2;
   }
 
-  strfcpy (t, c, sizeof (pop_data->err_msg) - strlen (pop_data->err_msg));
+  m_strcpy(t, sizeof(pop_data->err_msg) - strlen(pop_data->err_msg), c);
   str_skip_trailws (pop_data->err_msg);
 }
 
@@ -153,7 +153,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 +177,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 +222,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 +276,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 +330,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 +363,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 +411,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,7 +438,7 @@ 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;
@@ -462,7 +462,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)) {