projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename pop_query_d to pop_query and remove useless arg
[apps/madmutt.git]
/
imap
/
command.c
diff --git
a/imap/command.c
b/imap/command.c
index
5caaee9
..
8b93712
100644
(file)
--- a/
imap/command.c
+++ b/
imap/command.c
@@
-12,13
+12,7
@@
/* command.c: routines for sending commands to an IMAP server and parsing
* responses */
/* command.c: routines for sending commands to an IMAP server and parsing
* responses */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "message.h"
#include "mutt.h"
#include "message.h"
@@
-131,7
+125,7
@@
int imap_cmd_step (IMAP_DATA * idata)
idata->lastread = time (NULL);
/* handle untagged messages. The caller still gets its shot afterwards. */
idata->lastread = time (NULL);
/* handle untagged messages. The caller still gets its shot afterwards. */
- if (!
ascii_strncmp
(cmd->buf, "* ", 2) && cmd_handle_untagged (idata))
+ if (!
m_strncmp
(cmd->buf, "* ", 2) && cmd_handle_untagged (idata))
return IMAP_CMD_BAD;
/* server demands a continuation response from us */
return IMAP_CMD_BAD;
/* server demands a continuation response from us */
@@
-139,7
+133,7
@@
int imap_cmd_step (IMAP_DATA * idata)
return IMAP_CMD_RESPOND;
/* tagged completion code */
return IMAP_CMD_RESPOND;
/* tagged completion code */
- if (!
ascii_strncmp
(cmd->buf, cmd->seq, SEQLEN)) {
+ if (!
m_strncmp
(cmd->buf, cmd->seq, SEQLEN)) {
imap_cmd_finish (idata);
return imap_code (cmd->buf) ? IMAP_CMD_OK : IMAP_CMD_NO;
}
imap_cmd_finish (idata);
return imap_code (cmd->buf) ? IMAP_CMD_OK : IMAP_CMD_NO;
}
@@
-186,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);
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) {
p_delete(&out);
if (rc < 0) {