X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fcommand.c;h=83ebbe73d00997f64b8d04d581f5d5362b9a91f4;hp=915e3f1acc393595835a6d9c775b6172b1e5a37e;hb=1ee89902de184a640c171ae3285bff6882a791bd;hpb=1c16e9623a9fb6a15bb284a6f7322b583ebc06a7 diff --git a/imap/command.c b/imap/command.c index 915e3f1..83ebbe7 100644 --- a/imap/command.c +++ b/imap/command.c @@ -12,15 +12,7 @@ /* command.c: routines for sending commands to an IMAP server and parsing * responses */ -#if HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include -#include - -#include "lib/debug.h" +#include #include "mutt.h" #include "message.h" @@ -106,7 +98,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 +105,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 +120,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); @@ -155,9 +144,8 @@ int imap_cmd_step (IMAP_DATA * idata) /* imap_code: returns 1 if the command result was OK, or 0 if NO or BAD */ int imap_code (const char *s) { - s += SEQLEN; - SKIPWS (s); - return (ascii_strncasecmp ("OK", s, 2) == 0); + s = vskipspaces(s + SEQLEN); + return !ascii_strncasecmp("OK", s, 2); } /* imap_exec: execute a command, and wait for the response from the server. @@ -192,9 +180,7 @@ int imap_exec (IMAP_DATA * idata, const char *cmd, int flags) 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); + rc = mutt_socket_write(idata->conn, out); p_delete(&out); if (rc < 0) { @@ -217,11 +203,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; @@ -258,14 +240,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 && @@ -318,8 +298,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); @@ -336,10 +314,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; @@ -360,15 +337,12 @@ 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; /* server shut down our connection */ - s += 3; - SKIPWS (s); + s = vskipspaces(s + 3); mutt_error ("%s", s); mutt_sleep (2); cmd_handle_fatal (idata); @@ -376,8 +350,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); @@ -387,7 +359,7 @@ static int cmd_handle_untagged (IMAP_DATA * idata) } /* This should be optimised (eg with a tree or hash) */ -static int uid2msgno (IMAP_DATA* idata, unsigned int uid) { +static int uid2msgno (IMAP_DATA* idata, int uid) { int i; for (i = 0; i < idata->ctx->msgcount; i++) { @@ -404,12 +376,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; } @@ -430,8 +400,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); @@ -455,8 +423,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 @@ -484,8 +450,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) @@ -497,7 +461,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; } @@ -505,7 +468,6 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s) } if (!h) { - debug_print (1, ("FETCH response ignored for this message\n")); return; } @@ -514,13 +476,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; } @@ -546,7 +506,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; } @@ -567,9 +526,8 @@ 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)); - strfcpy (buf, "mailboxes \"", sizeof (buf)); + m_strcpy(buf, sizeof(buf), "mailboxes \""); mutt_account_tourl (&idata->conn->account, &url); url.path = s; if (!m_strcmp(url.user, ImapUser)) @@ -579,19 +537,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);