X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fcommand.c;fp=imap%2Fcommand.c;h=5caaee9485eb09ab01434fec6ea04ba319a7db05;hp=3893f89ad0737ba3c4e437f32de6c190986bcf93;hb=23e6291cb5d5b4cd2008403d8b628007fd75ff23;hpb=56025510c87ad388a257fcbd8b369b0edcf97c34 diff --git a/imap/command.c b/imap/command.c index 3893f89..5caaee9 100644 --- a/imap/command.c +++ b/imap/command.c @@ -19,8 +19,6 @@ #include #include #include -#include - #include "mutt.h" #include "message.h" @@ -106,7 +104,6 @@ int imap_cmd_step (IMAP_DATA * idata) if (len == cmd->blen) { 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)); } if (len) @@ -114,7 +111,6 @@ int imap_cmd_step (IMAP_DATA * idata) c = mutt_socket_readln (cmd->buf + len, cmd->blen - len, idata->conn); if (c <= 0) { - debug_print (1, ("Error reading server response.\n")); /* cmd_handle_fatal (idata); */ return IMAP_CMD_BAD; } @@ -130,7 +126,6 @@ int imap_cmd_step (IMAP_DATA * idata) if ((cmd->blen > IMAP_CMD_BUFSIZE) && (len <= 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)); } idata->lastread = time (NULL); @@ -216,11 +211,7 @@ int imap_exec (IMAP_DATA * idata, const char *cmd, int flags) return -2; if (rc != IMAP_CMD_OK) { - if (flags & IMAP_CMD_FAIL_OK) - return -2; - - debug_print (1, ("command failed: %s\n", idata->cmd.buf)); - return -1; + return (flags & IMAP_CMD_FAIL_OK) ? -2 : -1; } return 0; @@ -257,14 +248,12 @@ void imap_cmd_finish (IMAP_DATA * idata) (idata->reopen & IMAP_NEWMAIL_PENDING) && count > idata->ctx->msgcount) { /* read new mail messages */ - 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) { - debug_print (2, ("Expunging mailbox\n")); imap_expunge_mailbox (idata); /* Detect whether we've gotten unexpected EXPUNGE messages */ if (idata->reopen & IMAP_EXPUNGE_PENDING && @@ -317,8 +306,6 @@ static int cmd_handle_untagged (IMAP_DATA * idata) * connection, so update that one. */ if (ascii_strncasecmp ("EXISTS", s, 6) == 0) { - debug_print (2, ("Handling EXISTS\n")); - /* new mail arrived */ count = atoi (pn); @@ -335,10 +322,9 @@ 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) - debug_print (3, ("superfluous EXISTS message.\n")); + ; else { if (!(idata->reopen & IMAP_EXPUNGE_PENDING)) { - debug_print (2, ("New mail in %s - %d messages total.\n", idata->mailbox, count)); idata->reopen |= IMAP_NEWMAIL_PENDING; } idata->newMailCount = count; @@ -359,8 +345,6 @@ static int cmd_handle_untagged (IMAP_DATA * idata) else if (ascii_strncasecmp ("SEARCH", s, 6) == 0) cmd_parse_search (idata, s); else if (ascii_strncasecmp ("BYE", s, 3) == 0) { - debug_print (2, ("Handling BYE\n")); - /* check if we're logging out */ if (idata->status == IMAP_BYE) return 0; @@ -374,8 +358,6 @@ static int cmd_handle_untagged (IMAP_DATA * idata) } else if (option (OPTIMAPSERVERNOISE) && (ascii_strncasecmp ("NO", s, 2) == 0)) { - debug_print (2, ("Handling untagged NO\n")); - /* Display the warning message from the server */ mutt_error ("%s", s + 3); mutt_sleep (2); @@ -402,12 +384,10 @@ static void cmd_parse_search (IMAP_DATA* idata, char* s) { unsigned int uid; int msgno; - debug_print (2, ("Handling SEARCH\n")); - while ((s = imap_next_word (s)) && *s != '\0') { uid = atoi (s); msgno = uid2msgno (idata, uid); - + if (msgno >= 0) idata->ctx->hdrs[uid2msgno (idata, uid)]->matched = 1; } @@ -428,8 +408,6 @@ static void cmd_parse_capabilities (IMAP_DATA * idata, char *s) { int x; - debug_print (2, ("Handling CAPABILITY\n")); - s = imap_next_word (s); p_delete(&idata->capstr); idata->capstr = m_strdup(s); @@ -453,8 +431,6 @@ static void cmd_parse_expunge (IMAP_DATA * idata, const char *s) int expno, cur; HEADER *h; - debug_print (2, ("Handling EXPUNGE\n")); - expno = atoi (s); /* walk headers, zero seqno of expunged message, decrement seqno of those @@ -482,8 +458,6 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s) int msgno, cur; HEADER *h = NULL; - debug_print (2, ("Handling FETCH\n")); - msgno = atoi (s); if (msgno <= idata->ctx->msgcount) @@ -495,7 +469,6 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s) break; if (h->active && h->index + 1 == msgno) { - debug_print (2, ("Message UID %d updated\n", HEADER_DATA (h)->uid)); break; } @@ -503,7 +476,6 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s) } if (!h) { - debug_print (1, ("FETCH response ignored for this message\n")); return; } @@ -512,13 +484,11 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s) s = imap_next_word (s); if (*s != '(') { - debug_print (1, ("Malformed FETCH response\n")); return; } s++; if (ascii_strncasecmp ("FLAGS", s, 5) != 0) { - debug_print (2, ("Only handle FLAGS updates\n")); return; } @@ -544,7 +514,6 @@ static void cmd_parse_lsub (IMAP_DATA* idata, char* s) { s = imap_next_word (s); /* flags */ if (*s != '(') { - debug_print (1, ("Bad LSUB response\n")); return; } @@ -565,7 +534,6 @@ static void cmd_parse_lsub (IMAP_DATA* idata, char* s) { if (s) { imap_unmunge_mbox_name (s); - debug_print (2, ("Subscribing to %s\n", s)); m_strcpy(buf, sizeof(buf), "mailboxes \""); mutt_account_tourl (&idata->conn->account, &url); @@ -577,19 +545,14 @@ static void cmd_parse_lsub (IMAP_DATA* idata, char* s) { 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)); + mutt_parse_rc_line (buf, &token, &err); p_delete(&token.data); } - else - debug_print (1, ("Bad LSUB response\n")); } /* cmd_parse_myrights: set rights bits according to MYRIGHTS response */ static void cmd_parse_myrights (IMAP_DATA * idata, char *s) { - debug_print (2, ("Handling MYRIGHTS\n")); - s = imap_next_word (s); s = imap_next_word (s);