projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make taht shorter
[apps/madmutt.git]
/
imap
/
command.c
diff --git
a/imap/command.c
b/imap/command.c
index
1232457
..
6968334
100644
(file)
--- a/
imap/command.c
+++ b/
imap/command.c
@@
-17,15
+17,14
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/debug.h"
#include "mutt.h"
#include "message.h"
#include "mx.h"
#include "mutt.h"
#include "message.h"
#include "mx.h"
-#include "ascii.h"
#include "imap_private.h"
#include <ctype.h>
#include "imap_private.h"
#include <ctype.h>
@@
-75,7
+74,7
@@
int imap_cmd_start (IMAP_DATA * idata, const char *cmd)
cmd_make_sequence (idata);
/* seq, space, cmd, \r\n\0 */
cmd_make_sequence (idata);
/* seq, space, cmd, \r\n\0 */
- outlen =
str_len (idata->cmd.seq) + str_len
(cmd) + 4;
+ outlen =
m_strlen(idata->cmd.seq) + m_strlen
(cmd) + 4;
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);
@@
-105,7
+104,7
@@
int imap_cmd_step (IMAP_DATA * idata)
* line */
do {
if (len == cmd->blen) {
* line */
do {
if (len == cmd->blen) {
-
mem_realloc
(&cmd->buf, cmd->blen + IMAP_CMD_BUFSIZE);
+
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));
}
cmd->blen = cmd->blen + IMAP_CMD_BUFSIZE;
debug_print (3, ("grew buffer to %u bytes\n", cmd->blen));
}
@@
-129,7
+128,7
@@
int imap_cmd_step (IMAP_DATA * idata)
/* don't let one large string make cmd->buf hog memory forever */
if ((cmd->blen > IMAP_CMD_BUFSIZE) && (len <= IMAP_CMD_BUFSIZE)) {
/* don't let one large string make cmd->buf hog memory forever */
if ((cmd->blen > IMAP_CMD_BUFSIZE) && (len <= IMAP_CMD_BUFSIZE)) {
-
mem_realloc
(&cmd->buf, 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));
}
cmd->blen = IMAP_CMD_BUFSIZE;
debug_print (3, ("shrank buffer to %u bytes\n", cmd->blen));
}
@@
-156,9
+155,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)
{
/* 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.
}
/* imap_exec: execute a command, and wait for the response from the server.
@@
-189,7
+187,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 */
/* create sequence for command */
cmd_make_sequence (idata);
/* seq, space, cmd, \r\n\0 */
- outlen =
str_len (idata->cmd.seq) + str_len
(cmd) + 4;
+ outlen =
m_strlen(idata->cmd.seq) + m_strlen
(cmd) + 4;
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);
@@
-368,8
+366,7
@@
static int cmd_handle_untagged (IMAP_DATA * idata)
return 0;
/* server shut down our connection */
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);
mutt_error ("%s", s);
mutt_sleep (2);
cmd_handle_fatal (idata);
@@
-435,9
+432,9
@@
static void cmd_parse_capabilities (IMAP_DATA * idata, char *s)
s = imap_next_word (s);
p_delete(&idata->capstr);
s = imap_next_word (s);
p_delete(&idata->capstr);
- idata->capstr =
str_dup
(s);
+ idata->capstr =
m_strdup
(s);
-
memset (idata->capabilities, 0, sizeof (idata->capabilities)
);
+
p_clear(idata->capabilities, 1
);
while (*s) {
for (x = 0; x < CAPMAX; x++)
while (*s) {
for (x = 0; x < CAPMAX; x++)
@@
-570,14
+567,14
@@
static void cmd_parse_lsub (IMAP_DATA* idata, char* s) {
imap_unmunge_mbox_name (s);
debug_print (2, ("Subscribing to %s\n", 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;
mutt_account_tourl (&idata->conn->account, &url);
url.path = s;
- if (!
str_cmp
(url.user, ImapUser))
+ if (!
m_strcmp
(url.user, ImapUser))
url.user = NULL;
url_ciss_tostring (&url, buf + 11, sizeof (buf) - 10, 0);
url.user = NULL;
url_ciss_tostring (&url, buf + 11, sizeof (buf) - 10, 0);
-
str_cat (buf, sizeof
(buf), "\"");
-
memset (&token, 0, sizeof (token)
);
+
m_strcat(buf, sizeof
(buf), "\"");
+
p_clear(&token, 1
);
err.data = errstr;
err.dsize = sizeof (errstr);
if (mutt_parse_rc_line (buf, &token, &err))
err.data = errstr;
err.dsize = sizeof (errstr);
if (mutt_parse_rc_line (buf, &token, &err))
@@
-597,7
+594,7
@@
static void cmd_parse_myrights (IMAP_DATA * idata, char *s)
s = imap_next_word (s);
/* zero out current rights set */
s = imap_next_word (s);
/* zero out current rights set */
-
memset (idata->rights, 0, sizeof (idata->rights)
);
+
p_clear(idata->rights, 1
);
while (*s && !isspace ((unsigned char) *s)) {
switch (*s) {
while (*s && !isspace ((unsigned char) *s)) {
switch (*s) {