X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fcommand.c;h=413bec025cf20c0e3cbc8fdc3fa0785c6f2a3595;hb=d9ae612d6dba4f68f46a1a81eb77a326849f9184;hp=bd2ad173cb27ae94e533d89617ec59f14b11e095;hpb=c3e57678c8be193fc137854020f3a90887be97c9;p=apps%2Fmadmutt.git

diff --git a/imap/command.c b/imap/command.c
index bd2ad17..413bec0 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -21,6 +21,9 @@
 #include "message.h"
 #include "mx.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+
 #include <ctype.h>
 #include <stdlib.h>
 
@@ -66,7 +69,7 @@ int imap_cmd_start (IMAP_DATA * idata, const char *cmd)
 
   cmd_make_sequence (idata);
   /* seq, space, cmd, \r\n\0 */
-  outlen = strlen (idata->cmd.seq) + strlen (cmd) + 4;
+  outlen = safe_strlen (idata->cmd.seq) + safe_strlen (cmd) + 4;
   out = (char *) safe_malloc (outlen);
   snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
 
@@ -176,7 +179,7 @@ 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 = strlen (idata->cmd.seq) + strlen (cmd) + 4;
+  outlen = safe_strlen (idata->cmd.seq) + safe_strlen (cmd) + 4;
   out = (char *) safe_malloc (outlen);
   snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
 
@@ -512,31 +515,31 @@ static void cmd_parse_myrights (IMAP_DATA * idata, char *s)
   while (*s && !isspace ((unsigned char) *s)) {
     switch (*s) {
     case 'l':
-      mutt_bit_set (idata->rights, IMAP_ACL_LOOKUP);
+      mutt_bit_set (idata->rights, ACL_LOOKUP);
       break;
     case 'r':
-      mutt_bit_set (idata->rights, IMAP_ACL_READ);
+      mutt_bit_set (idata->rights, ACL_READ);
       break;
     case 's':
-      mutt_bit_set (idata->rights, IMAP_ACL_SEEN);
+      mutt_bit_set (idata->rights, ACL_SEEN);
       break;
     case 'w':
-      mutt_bit_set (idata->rights, IMAP_ACL_WRITE);
+      mutt_bit_set (idata->rights, ACL_WRITE);
       break;
     case 'i':
-      mutt_bit_set (idata->rights, IMAP_ACL_INSERT);
+      mutt_bit_set (idata->rights, ACL_INSERT);
       break;
     case 'p':
-      mutt_bit_set (idata->rights, IMAP_ACL_POST);
+      mutt_bit_set (idata->rights, ACL_POST);
       break;
     case 'c':
-      mutt_bit_set (idata->rights, IMAP_ACL_CREATE);
+      mutt_bit_set (idata->rights, ACL_CREATE);
       break;
     case 'd':
-      mutt_bit_set (idata->rights, IMAP_ACL_DELETE);
+      mutt_bit_set (idata->rights, ACL_DELETE);
       break;
     case 'a':
-      mutt_bit_set (idata->rights, IMAP_ACL_ADMIN);
+      mutt_bit_set (idata->rights, ACL_ADMIN);
       break;
     }
     s++;