Rocco Rutte:

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

diff --git a/imap/command.c b/imap/command.c
index d52fb27..413bec0 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -1,21 +1,12 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-8 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 1996-9 Brandon Long <blong@fiction.net>
  * Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 /* command.c: routines for sending commands to an IMAP server and parsing
@@ -30,6 +21,9 @@
 #include "message.h"
 #include "mx.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+
 #include <ctype.h>
 #include <stdlib.h>
 
@@ -75,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);
 
@@ -185,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);
 
@@ -521,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++;