drop str_[n]cat.

[apps/madmutt.git] / imap / command.c

diff --git a/imap/command.c b/imap/command.c
index 49e4441..915e3f1 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -16,14 +16,15 @@
 # include "config.h"
 #endif
 
-#include "lib/mem.h"
-#include "lib/intl.h"
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+
 #include "lib/debug.h"
 
 #include "mutt.h"
 #include "message.h"
 #include "mx.h"
-#include "ascii.h"
 #include "imap_private.h"
 
 #include <ctype.h>
@@ -42,7 +43,7 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s);
 static void cmd_parse_myrights (IMAP_DATA * idata, char *s);
 static void cmd_parse_search (IMAP_DATA* idata, char* s);
 
-static char *Capabilities[] = {
+static const char *Capabilities[] = {
   "IMAP4",
   "IMAP4rev1",
   "STATUS",
@@ -73,13 +74,13 @@ int imap_cmd_start (IMAP_DATA * idata, const char *cmd)
 
   cmd_make_sequence (idata);
   /* seq, space, cmd, \r\n\0 */
-  outlen = str_len (idata->cmd.seq) + str_len (cmd) + 4;
-  out = (char *) mem_malloc (outlen);
+  outlen = m_strlen(idata->cmd.seq) + m_strlen(cmd) + 4;
+  out = p_new(char, outlen);
   snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
 
   rc = mutt_socket_write (idata->conn, out);
 
-  mem_free (&out);
+  p_delete(&out);
 
   return (rc < 0) ? IMAP_CMD_BAD : 0;
 }
@@ -103,7 +104,7 @@ int imap_cmd_step (IMAP_DATA * idata)
    * line */
   do {
     if (len == cmd->blen) {
-      mem_realloc (&cmd->buf, cmd->blen + IMAP_CMD_BUFSIZE);
+      p_realloc(&cmd->buf, cmd->blen + IMAP_CMD_BUFSIZE);
       cmd->blen = cmd->blen + IMAP_CMD_BUFSIZE;
       debug_print (3, ("grew buffer to %u bytes\n", cmd->blen));
     }
@@ -127,7 +128,7 @@ int imap_cmd_step (IMAP_DATA * idata)
 
   /* don't let one large string make cmd->buf hog memory forever */
   if ((cmd->blen > IMAP_CMD_BUFSIZE) && (len <= IMAP_CMD_BUFSIZE)) {
-    mem_realloc (&cmd->buf, IMAP_CMD_BUFSIZE);
+    p_realloc(&cmd->buf, IMAP_CMD_BUFSIZE);
     cmd->blen = IMAP_CMD_BUFSIZE;
     debug_print (3, ("shrank buffer to %u bytes\n", cmd->blen));
   }
@@ -187,14 +188,14 @@ int imap_exec (IMAP_DATA * idata, const char *cmd, int flags)
   /* create sequence for command */
   cmd_make_sequence (idata);
   /* seq, space, cmd, \r\n\0 */
-  outlen = str_len (idata->cmd.seq) + str_len (cmd) + 4;
-  out = (char *) mem_malloc (outlen);
+  outlen = m_strlen(idata->cmd.seq) + m_strlen(cmd) + 4;
+  out = p_new(char, outlen);
   snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
 
   rc = mutt_socket_write_d (idata->conn, out,
                             flags & IMAP_CMD_PASS ? IMAP_LOG_PASS :
                             IMAP_LOG_CMD);
-  mem_free (&out);
+  p_delete(&out);
 
   if (rc < 0) {
     cmd_handle_fatal (idata);
@@ -432,10 +433,10 @@ static void cmd_parse_capabilities (IMAP_DATA * idata, char *s)
   debug_print (2, ("Handling CAPABILITY\n"));
 
   s = imap_next_word (s);
-  mem_free (&idata->capstr);
-  idata->capstr = str_dup (s);
+  p_delete(&idata->capstr);
+  idata->capstr = m_strdup(s);
 
-  memset (idata->capabilities, 0, sizeof (idata->capabilities));
+  p_clear(idata->capabilities, 1);
 
   while (*s) {
     for (x = 0; x < CAPMAX; x++)
@@ -492,6 +493,9 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s)
     for (cur = 0; cur < idata->ctx->msgcount; cur++) {
       h = idata->ctx->hdrs[cur];
 
+      if (!h)
+        break;
+
       if (h->active && h->index + 1 == msgno) {
         debug_print (2, ("Message UID %d updated\n", HEADER_DATA (h)->uid));
         break;
@@ -568,16 +572,16 @@ static void cmd_parse_lsub (IMAP_DATA* idata, char* s) {
     strfcpy (buf, "mailboxes \"", sizeof (buf));
     mutt_account_tourl (&idata->conn->account, &url);
     url.path = s;
-    if (!str_cmp (url.user, ImapUser))
+    if (!m_strcmp(url.user, ImapUser))
       url.user = NULL;
     url_ciss_tostring (&url, buf + 11, sizeof (buf) - 10, 0);
-    str_cat (buf, sizeof (buf), "\"");
-    memset (&token, 0, sizeof (token));
+    m_strcat(buf, sizeof(buf), "\"");
+    p_clear(&token, 1);
     err.data = errstr;
     err.dsize = sizeof (errstr);
     if (mutt_parse_rc_line (buf, &token, &err))
       debug_print (1, ("Error adding subscribed mailbox: %s\n", errstr));
-    mem_free (&token.data);
+    p_delete(&token.data);
   }
   else
     debug_print (1, ("Bad LSUB response\n"));
@@ -592,7 +596,7 @@ static void cmd_parse_myrights (IMAP_DATA * idata, char *s)
   s = imap_next_word (s);
 
   /* zero out current rights set */
-  memset (idata->rights, 0, sizeof (idata->rights));
+  p_clear(idata->rights, 1);
 
   while (*s && !isspace ((unsigned char) *s)) {
     switch (*s) {