X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fcommand.c;h=0a52ca4b0e2513b427c009b232d8034e8292cf22;hb=03ecb7c70bd09a8302212ed3e7f94f9a7b14d099;hp=d52fb27138184dcd72adb9e7b5486ca3e972d22c;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281;p=apps%2Fmadmutt.git diff --git a/imap/command.c b/imap/command.c index d52fb27..0a52ca4 100644 --- a/imap/command.c +++ b/imap/command.c @@ -1,21 +1,12 @@ /* + * Copyright notice from original mutt: * Copyright (C) 1996-8 Michael R. Elkins * Copyright (C) 1996-9 Brandon Long * Copyright (C) 1999-2002 Brendan Cully - * - * 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,10 @@ #include "message.h" #include "mx.h" +#include "lib/mem.h" +#include "lib/intl.h" +#include "lib/debug.h" + #include #include @@ -75,7 +70,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); @@ -107,14 +102,12 @@ int imap_cmd_step (IMAP_DATA * idata) if (len == cmd->blen) { safe_realloc (&cmd->buf, cmd->blen + IMAP_CMD_BUFSIZE); cmd->blen = cmd->blen + IMAP_CMD_BUFSIZE; - dprint (3, (debugfile, "imap_cmd_step: grew buffer to %u bytes\n", - cmd->blen)); + debug_print (3, ("grew buffer to %u bytes\n", cmd->blen)); } c = mutt_socket_readln (cmd->buf + len, cmd->blen - len, idata->conn); if (c <= 0) { - dprint (1, - (debugfile, "imap_cmd_step: Error reading server response.\n")); + debug_print (1, ("Error reading server response.\n")); /* cmd_handle_fatal (idata); */ return IMAP_CMD_BAD; } @@ -130,9 +123,7 @@ int imap_cmd_step (IMAP_DATA * idata) if ((cmd->blen > IMAP_CMD_BUFSIZE) && (len <= IMAP_CMD_BUFSIZE)) { safe_realloc (&cmd->buf, IMAP_CMD_BUFSIZE); cmd->blen = IMAP_CMD_BUFSIZE; - dprint (3, - (debugfile, "imap_cmd_step: shrank buffer to %u bytes\n", - cmd->blen)); + debug_print (3, ("shrank buffer to %u bytes\n", cmd->blen)); } idata->lastread = time (NULL); @@ -185,7 +176,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); @@ -217,8 +208,7 @@ int imap_exec (IMAP_DATA * idata, const char *cmd, int flags) if (flags & IMAP_CMD_FAIL_OK) return -2; - dprint (1, - (debugfile, "imap_exec: command failed: %s\n", idata->cmd.buf)); + debug_print (1, ("command failed: %s\n", idata->cmd.buf)); return -1; } @@ -256,14 +246,14 @@ void imap_cmd_finish (IMAP_DATA * idata) (idata->reopen & IMAP_NEWMAIL_PENDING) && count > idata->ctx->msgcount) { /* read new mail messages */ - dprint (2, (debugfile, "imap_cmd_finish: Fetching new mail\n")); + debug_print (2, ("Fetching new mail\n")); /* check_status: curs_main uses imap_check_mailbox to detect * whether the index needs updating */ idata->check_status = IMAP_NEWMAIL_PENDING; imap_read_headers (idata, idata->ctx->msgcount, count - 1); } else if (idata->reopen & IMAP_EXPUNGE_PENDING) { - dprint (2, (debugfile, "imap_cmd_finish: Expunging mailbox\n")); + debug_print (2, ("Expunging mailbox\n")); imap_expunge_mailbox (idata); /* Detect whether we've gotten unexpected EXPUNGE messages */ if (idata->reopen & IMAP_EXPUNGE_PENDING && @@ -315,7 +305,7 @@ static int cmd_handle_untagged (IMAP_DATA * idata) * connection, so update that one. */ if (ascii_strncasecmp ("EXISTS", s, 6) == 0) { - dprint (2, (debugfile, "Handling EXISTS\n")); + debug_print (2, ("Handling EXISTS\n")); /* new mail arrived */ count = atoi (pn); @@ -333,13 +323,10 @@ static int cmd_handle_untagged (IMAP_DATA * idata) /* at least the InterChange server sends EXISTS messages freely, * even when there is no new mail */ else if (count == idata->ctx->msgcount) - dprint (3, (debugfile, - "cmd_handle_untagged: superfluous EXISTS message.\n")); + debug_print (3, ("superfluous EXISTS message.\n")); else { if (!(idata->reopen & IMAP_EXPUNGE_PENDING)) { - dprint (2, (debugfile, - "cmd_handle_untagged: New mail in %s - %d messages total.\n", - idata->mailbox, count)); + debug_print (2, ("New mail in %s - %d messages total.\n", idata->mailbox, count)); idata->reopen |= IMAP_NEWMAIL_PENDING; } idata->newMailCount = count; @@ -356,7 +343,7 @@ static int cmd_handle_untagged (IMAP_DATA * idata) else if (ascii_strncasecmp ("MYRIGHTS", s, 8) == 0) cmd_parse_myrights (idata, s); else if (ascii_strncasecmp ("BYE", s, 3) == 0) { - dprint (2, (debugfile, "Handling BYE\n")); + debug_print (2, ("Handling BYE\n")); /* check if we're logging out */ if (idata->status == IMAP_BYE) @@ -380,7 +367,7 @@ static int cmd_handle_untagged (IMAP_DATA * idata) } else if (option (OPTIMAPSERVERNOISE) && (ascii_strncasecmp ("NO", s, 2) == 0)) { - dprint (2, (debugfile, "Handling untagged NO\n")); + debug_print (2, ("Handling untagged NO\n")); /* Display the warning message from the server */ mutt_error ("%s", s + 3); @@ -405,7 +392,7 @@ static void cmd_parse_capabilities (IMAP_DATA * idata, char *s) { int x; - dprint (2, (debugfile, "Handling CAPABILITY\n")); + debug_print (2, ("Handling CAPABILITY\n")); s = imap_next_word (s); FREE (&idata->capstr); @@ -430,7 +417,7 @@ static void cmd_parse_expunge (IMAP_DATA * idata, const char *s) int expno, cur; HEADER *h; - dprint (2, (debugfile, "Handling EXPUNGE\n")); + debug_print (2, ("Handling EXPUNGE\n")); expno = atoi (s); @@ -459,7 +446,7 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s) int msgno, cur; HEADER *h = NULL; - dprint (2, (debugfile, "Handling FETCH\n")); + debug_print (2, ("Handling FETCH\n")); msgno = atoi (s); @@ -469,9 +456,7 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s) h = idata->ctx->hdrs[cur]; if (h->active && h->index + 1 == msgno) { - dprint (2, - (debugfile, "Message UID %d updated\n", - HEADER_DATA (h)->uid)); + debug_print (2, ("Message UID %d updated\n", HEADER_DATA (h)->uid)); break; } @@ -479,7 +464,7 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s) } if (!h) { - dprint (1, (debugfile, "FETCH response ignored for this message\n")); + debug_print (1, ("FETCH response ignored for this message\n")); return; } @@ -488,13 +473,13 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s) s = imap_next_word (s); if (*s != '(') { - dprint (1, (debugfile, "Malformed FETCH response")); + debug_print (1, ("Malformed FETCH response\n")); return; } s++; if (ascii_strncasecmp ("FLAGS", s, 5) != 0) { - dprint (2, (debugfile, "Only handle FLAGS updates\n")); + debug_print (2, ("Only handle FLAGS updates\n")); return; } @@ -510,7 +495,7 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s) /* cmd_parse_myrights: set rights bits according to MYRIGHTS response */ static void cmd_parse_myrights (IMAP_DATA * idata, char *s) { - dprint (2, (debugfile, "Handling MYRIGHTS\n")); + debug_print (2, ("Handling MYRIGHTS\n")); s = imap_next_word (s); s = imap_next_word (s); @@ -521,31 +506,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++;