projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
imap
/
command.c
diff --git
a/imap/command.c
b/imap/command.c
index
0a52ca4
..
f76cff6
100644
(file)
--- a/
imap/command.c
+++ b/
imap/command.c
@@
-70,13
+70,13
@@
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 = s
afe_strlen (idata->cmd.seq) + safe_str
len (cmd) + 4;
- out = (char *)
safe
_malloc (outlen);
+ outlen = s
tr_len (idata->cmd.seq) + str_
len (cmd) + 4;
+ out = (char *)
mem
_malloc (outlen);
snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
rc = mutt_socket_write (idata->conn, out);
snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
rc = mutt_socket_write (idata->conn, out);
-
FREE
(&out);
+
mem_free
(&out);
return (rc < 0) ? IMAP_CMD_BAD : 0;
}
return (rc < 0) ? IMAP_CMD_BAD : 0;
}
@@
-100,7
+100,7
@@
int imap_cmd_step (IMAP_DATA * idata)
* line */
do {
if (len == cmd->blen) {
* line */
do {
if (len == cmd->blen) {
-
safe
_realloc (&cmd->buf, cmd->blen + IMAP_CMD_BUFSIZE);
+
mem
_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));
}
@@
-121,7
+121,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)) {
-
safe
_realloc (&cmd->buf, IMAP_CMD_BUFSIZE);
+
mem
_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));
}
@@
-168,6
+168,12
@@
int imap_exec (IMAP_DATA * idata, const char *cmd, int flags)
int outlen;
int rc;
int outlen;
int rc;
+ if (!idata) {
+ mutt_error (_("No mailbox is open."));
+ mutt_sleep (1);
+ return (-1);
+ }
+
if (idata->status == IMAP_FATAL) {
cmd_handle_fatal (idata);
return -1;
if (idata->status == IMAP_FATAL) {
cmd_handle_fatal (idata);
return -1;
@@
-176,14
+182,14
@@
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 = s
afe_strlen (idata->cmd.seq) + safe_str
len (cmd) + 4;
- out = (char *)
safe
_malloc (outlen);
+ outlen = s
tr_len (idata->cmd.seq) + str_
len (cmd) + 4;
+ out = (char *)
mem
_malloc (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);
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);
-
FREE
(&out);
+
mem_free
(&out);
if (rc < 0) {
cmd_handle_fatal (idata);
if (rc < 0) {
cmd_handle_fatal (idata);
@@
-273,8
+279,8
@@
static void cmd_handle_fatal (IMAP_DATA * idata)
idata->status = IMAP_FATAL;
if ((idata->state == IMAP_SELECTED) &&
idata->status = IMAP_FATAL;
if ((idata->state == IMAP_SELECTED) &&
- (idata->reopen & IMAP_REOPEN_ALLOW)
&& !idata->ctx->closing
) {
- /*mx_fastclose_mailbox (idata->ctx); */
+ (idata->reopen & IMAP_REOPEN_ALLOW)) {
+ /*
mx_fastclose_mailbox (idata->ctx); */
mutt_error (_("Mailbox closed"));
mutt_sleep (1);
idata->state = IMAP_DISCONNECTED;
mutt_error (_("Mailbox closed"));
mutt_sleep (1);
idata->state = IMAP_DISCONNECTED;
@@
-284,6
+290,7
@@
static void cmd_handle_fatal (IMAP_DATA * idata)
if (idata->state != IMAP_SELECTED) {
idata->state = IMAP_DISCONNECTED;
if (idata->state != IMAP_SELECTED) {
idata->state = IMAP_DISCONNECTED;
+ mutt_socket_close (idata->conn);
idata->status = 0;
}
}
idata->status = 0;
}
}
@@
-353,17
+360,9
@@
static int cmd_handle_untagged (IMAP_DATA * idata)
s += 3;
SKIPWS (s);
mutt_error ("%s", s);
s += 3;
SKIPWS (s);
mutt_error ("%s", s);
- idata->status = IMAP_BYE;
-
- /*if (imap_reconnect(idata->ctx)!=0) {
- if (idata->state == IMAP_SELECTED)
- mx_fastclose_mailbox (idata->ctx); *//* XXX memleak? */
- mutt_socket_close (idata->conn);
- idata->state = IMAP_DISCONNECTED;
+ mutt_sleep (2);
+ cmd_handle_fatal (idata);
return -1;
return -1;
- /*} else {
- return 0;
- } */
}
else if (option (OPTIMAPSERVERNOISE)
&& (ascii_strncasecmp ("NO", s, 2) == 0)) {
}
else if (option (OPTIMAPSERVERNOISE)
&& (ascii_strncasecmp ("NO", s, 2) == 0)) {
@@
-395,8
+394,8
@@
static void cmd_parse_capabilities (IMAP_DATA * idata, char *s)
debug_print (2, ("Handling CAPABILITY\n"));
s = imap_next_word (s);
debug_print (2, ("Handling CAPABILITY\n"));
s = imap_next_word (s);
-
FREE
(&idata->capstr);
- idata->capstr = s
afe_str
dup (s);
+
mem_free
(&idata->capstr);
+ idata->capstr = s
tr_
dup (s);
memset (idata->capabilities, 0, sizeof (idata->capabilities));
memset (idata->capabilities, 0, sizeof (idata->capabilities));