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
/
imap.c
diff --git
a/imap/imap.c
b/imap/imap.c
index
202a10d
..
243df3a
100644
(file)
--- a/
imap/imap.c
+++ b/
imap/imap.c
@@
-65,7
+65,7
@@
int imap_access (const char *path, int flags)
if (!(idata = imap_conn_find (&mx.account,
option (OPTIMAPPASSIVE) ? M_IMAP_CONN_NONEW :
0))) {
if (!(idata = imap_conn_find (&mx.account,
option (OPTIMAPPASSIVE) ? M_IMAP_CONN_NONEW :
0))) {
-
FREE
(&mx.mbox);
+
mem_free
(&mx.mbox);
return -1;
}
return -1;
}
@@
-73,11
+73,11
@@
int imap_access (const char *path, int flags)
/* we may already be in the folder we're checking */
if (!ascii_strcmp(idata->mailbox, mx.mbox)) {
/* we may already be in the folder we're checking */
if (!ascii_strcmp(idata->mailbox, mx.mbox)) {
-
FREE
(&mx.mbox);
+
mem_free
(&mx.mbox);
return 0;
}
return 0;
}
-
FREE
(&mx.mbox);
+
mem_free
(&mx.mbox);
imap_munge_mbox_name (mbox, sizeof (mbox), mailbox);
if (mutt_bit_isset (idata->capabilities, IMAP4REV1))
imap_munge_mbox_name (mbox, sizeof (mbox), mailbox);
if (mutt_bit_isset (idata->capabilities, IMAP4REV1))
@@
-137,7
+137,7
@@
int imap_delete_mailbox (CONTEXT * ctx, IMAP_MBOX mx)
if (!(idata = imap_conn_find (&mx.account,
option (OPTIMAPPASSIVE) ? M_IMAP_CONN_NONEW
: 0))) {
if (!(idata = imap_conn_find (&mx.account,
option (OPTIMAPPASSIVE) ? M_IMAP_CONN_NONEW
: 0))) {
-
FREE
(&mx.mbox);
+
mem_free
(&mx.mbox);
return -1;
}
}
return -1;
}
}
@@
-240,7
+240,7
@@
void imap_expunge_mailbox (IMAP_DATA * idata)
if (idata->cache[cacheno].uid == HEADER_DATA (h)->uid &&
idata->cache[cacheno].path) {
unlink (idata->cache[cacheno].path);
if (idata->cache[cacheno].uid == HEADER_DATA (h)->uid &&
idata->cache[cacheno].path) {
unlink (idata->cache[cacheno].path);
-
FREE
(&idata->cache[cacheno].path);
+
mem_free
(&idata->cache[cacheno].path);
}
imap_free_header_data (&h->data);
}
imap_free_header_data (&h->data);
@@
-382,7
+382,7
@@
IMAP_DATA *imap_conn_find (const ACCOUNT * account, int flags)
else
mutt_account_unsetpass (&idata->conn->account);
else
mutt_account_unsetpass (&idata->conn->account);
-
FREE
(&idata->capstr);
+
mem_free
(&idata->capstr);
}
if (idata->state == IMAP_AUTHENTICATED)
imap_get_delim (idata);
}
if (idata->state == IMAP_AUTHENTICATED)
imap_get_delim (idata);
@@
-454,7
+454,7
@@
int imap_open_connection (IMAP_DATA * idata)
idata->state = IMAP_AUTHENTICATED;
if (imap_check_capabilities (idata) != 0)
goto bail;
idata->state = IMAP_AUTHENTICATED;
if (imap_check_capabilities (idata) != 0)
goto bail;
-
FREE
(&idata->capstr);
+
mem_free
(&idata->capstr);
}
else {
imap_error ("imap_open_connection()", buf);
}
else {
imap_error ("imap_open_connection()", buf);
@@
-467,7
+467,7
@@
err_close_conn:
mutt_socket_close (idata->conn);
idata->state = IMAP_DISCONNECTED;
bail:
mutt_socket_close (idata->conn);
idata->state = IMAP_DISCONNECTED;
bail:
-
FREE
(&idata->capstr);
+
mem_free
(&idata->capstr);
return -1;
}
return -1;
}
@@
-549,12
+549,12
@@
int imap_open_mailbox (CONTEXT * ctx)
/* Clean up path and replace the one in the ctx */
imap_fix_path (idata, mx.mbox, buf, sizeof (buf));
/* Clean up path and replace the one in the ctx */
imap_fix_path (idata, mx.mbox, buf, sizeof (buf));
-
FREE
(&(idata->mailbox));
- idata->mailbox = s
afe_str
dup (buf);
+
mem_free
(&(idata->mailbox));
+ idata->mailbox = s
tr_
dup (buf);
imap_qualify_path (buf, sizeof (buf), &mx, idata->mailbox);
imap_qualify_path (buf, sizeof (buf), &mx, idata->mailbox);
-
FREE
(&(ctx->path));
- ctx->path = s
afe_str
dup (buf);
+
mem_free
(&(ctx->path));
+ ctx->path = s
tr_
dup (buf);
idata->ctx = ctx;
idata->ctx = ctx;
@@
-682,8
+682,8
@@
int imap_open_mailbox (CONTEXT * ctx)
}
ctx->hdrmax = count;
}
ctx->hdrmax = count;
- ctx->hdrs =
safe
_calloc (count, sizeof (HEADER *));
- ctx->v2r =
safe
_calloc (count, sizeof (int));
+ ctx->hdrs =
mem
_calloc (count, sizeof (HEADER *));
+ ctx->v2r =
mem
_calloc (count, sizeof (int));
ctx->msgcount = 0;
if (count && (imap_read_headers (idata, 0, count - 1) < 0)) {
mutt_error _("Error opening mailbox");
ctx->msgcount = 0;
if (count && (imap_read_headers (idata, 0, count - 1) < 0)) {
mutt_error _("Error opening mailbox");
@@
-693,14
+693,14
@@
int imap_open_mailbox (CONTEXT * ctx)
}
debug_print (2, ("msgcount is %d\n", ctx->msgcount));
}
debug_print (2, ("msgcount is %d\n", ctx->msgcount));
-
FREE
(&mx.mbox);
+
mem_free
(&mx.mbox);
return 0;
fail:
if (idata->state == IMAP_SELECTED)
idata->state = IMAP_AUTHENTICATED;
fail_noidata:
return 0;
fail:
if (idata->state == IMAP_SELECTED)
idata->state = IMAP_AUTHENTICATED;
fail_noidata:
-
FREE
(&mx.mbox);
+
mem_free
(&mx.mbox);
return -1;
}
return -1;
}
@@
-719,7
+719,7
@@
int imap_open_mailbox_append (CONTEXT * ctx)
* ctx is brand new and mostly empty */
if (!(idata = imap_conn_find (&(mx.account), 0))) {
* ctx is brand new and mostly empty */
if (!(idata = imap_conn_find (&(mx.account), 0))) {
-
FREE
(&mx.mbox);
+
mem_free
(&mx.mbox);
return (-1);
}
conn = idata->conn;
return (-1);
}
conn = idata->conn;
@@
-729,7
+729,7
@@
int imap_open_mailbox_append (CONTEXT * ctx)
imap_fix_path (idata, mx.mbox, mailbox, sizeof (mailbox));
imap_fix_path (idata, mx.mbox, mailbox, sizeof (mailbox));
-
FREE
(&mx.mbox);
+
mem_free
(&mx.mbox);
/* really we should also check for W_OK */
if (!imap_access (ctx->path, F_OK))
/* really we should also check for W_OK */
if (!imap_access (ctx->path, F_OK))
@@
-753,8
+753,8
@@
void imap_logout (IMAP_DATA * idata)
idata->status = IMAP_BYE;
imap_cmd_start (idata, "LOGOUT");
while (imap_cmd_step (idata) == IMAP_CMD_CONTINUE);
idata->status = IMAP_BYE;
imap_cmd_start (idata, "LOGOUT");
while (imap_cmd_step (idata) == IMAP_CMD_CONTINUE);
-
FREE
(&idata->cmd.buf);
-
FREE
(&idata);
+
mem_free
(&idata->cmd.buf);
+
mem_free
(&idata);
}
/*
}
/*
@@
-781,7
+781,7
@@
static void imap_set_flag (IMAP_DATA * idata, int aclbit, int flag,
{
if (mutt_bit_isset (idata->rights, aclbit))
if (flag)
{
if (mutt_bit_isset (idata->rights, aclbit))
if (flag)
- s
afe_str
cat (flags, flsize, str);
+ s
tr_
cat (flags, flsize, str);
}
/* imap_make_msg_set: make an IMAP4rev1 UID message set out of a set of
}
/* imap_make_msg_set: make an IMAP4rev1 UID message set out of a set of
@@
-806,7
+806,7
@@
int imap_make_msg_set (IMAP_DATA * idata, BUFFER * buf, int flag, int changed)
int started = 0;
/* make copy of header pointers to sort in natural order */
int started = 0;
/* make copy of header pointers to sort in natural order */
- hdrs =
safe
_calloc (idata->ctx->msgcount, sizeof (HEADER *));
+ hdrs =
mem
_calloc (idata->ctx->msgcount, sizeof (HEADER *));
memcpy (hdrs, idata->ctx->hdrs, idata->ctx->msgcount * sizeof (HEADER *));
if (Sort != SORT_ORDER) {
memcpy (hdrs, idata->ctx->hdrs, idata->ctx->msgcount * sizeof (HEADER *));
if (Sort != SORT_ORDER) {
@@
-862,7
+862,7
@@
int imap_make_msg_set (IMAP_DATA * idata, BUFFER * buf, int flag, int changed)
}
}
}
}
-
FREE
(&hdrs);
+
mem_free
(&hdrs);
return count;
}
return count;
}
@@
-1045,10
+1045,10
@@
int imap_sync_mailbox (CONTEXT * ctx, int expunge, int *index_hint)
rc = 0;
out:
if (cmd.data)
rc = 0;
out:
if (cmd.data)
-
FREE
(&cmd.data);
+
mem_free
(&cmd.data);
if (appendctx) {
mx_fastclose_mailbox (appendctx);
if (appendctx) {
mx_fastclose_mailbox (appendctx);
-
FREE
(&appendctx);
+
mem_free
(&appendctx);
}
return rc;
}
}
return rc;
}
@@
-1074,7
+1074,7
@@
void imap_close_mailbox (CONTEXT * ctx)
}
idata->reopen &= IMAP_REOPEN_ALLOW;
}
idata->reopen &= IMAP_REOPEN_ALLOW;
-
FREE
(&(idata->mailbox));
+
mem_free
(&(idata->mailbox));
mutt_free_list (&idata->flags);
idata->ctx = NULL;
}
mutt_free_list (&idata->flags);
idata->ctx = NULL;
}
@@
-1086,7
+1086,7
@@
void imap_close_mailbox (CONTEXT * ctx)
for (i = 0; i < IMAP_CACHE_LEN; i++) {
if (idata->cache[i].path) {
unlink (idata->cache[i].path);
for (i = 0; i < IMAP_CACHE_LEN; i++) {
if (idata->cache[i].path) {
unlink (idata->cache[i].path);
-
FREE
(&idata->cache[i].path);
+
mem_free
(&idata->cache[i].path);
}
}
}
}
}
}
@@
-1155,13
+1155,13
@@
int imap_mailbox_check (char *path, int new)
connflags = M_IMAP_CONN_NONEW;
if (!(idata = imap_conn_find (&(mx.account), connflags))) {
connflags = M_IMAP_CONN_NONEW;
if (!(idata = imap_conn_find (&(mx.account), connflags))) {
-
FREE
(&mx.mbox);
+
mem_free
(&mx.mbox);
return -1;
}
conn = idata->conn;
imap_fix_path (idata, mx.mbox, buf, sizeof (buf));
return -1;
}
conn = idata->conn;
imap_fix_path (idata, mx.mbox, buf, sizeof (buf));
-
FREE
(&mx.mbox);
+
mem_free
(&mx.mbox);
imap_munge_mbox_name (mbox, sizeof (mbox), buf);
strfcpy (mbox_unquoted, buf, sizeof (mbox_unquoted));
imap_munge_mbox_name (mbox, sizeof (mbox), buf);
strfcpy (mbox_unquoted, buf, sizeof (mbox_unquoted));
@@
-1170,9
+1170,9
@@
int imap_mailbox_check (char *path, int new)
* command on a mailbox that you have selected
*/
* command on a mailbox that you have selected
*/
- if (
mutt_str
cmp (mbox_unquoted, idata->mailbox) == 0
+ if (
str_
cmp (mbox_unquoted, idata->mailbox) == 0
|| (ascii_strcasecmp (mbox_unquoted, "INBOX") == 0
|| (ascii_strcasecmp (mbox_unquoted, "INBOX") == 0
- && s
afe_str
casecmp (mbox_unquoted, idata->mailbox) == 0)) {
+ && s
tr_
casecmp (mbox_unquoted, idata->mailbox) == 0)) {
strfcpy (buf, "NOOP", sizeof (buf));
}
else if (mutt_bit_isset (idata->capabilities, IMAP4REV1) ||
strfcpy (buf, "NOOP", sizeof (buf));
}
else if (mutt_bit_isset (idata->capabilities, IMAP4REV1) ||
@@
-1197,8
+1197,8
@@
int imap_mailbox_check (char *path, int new)
/* The mailbox name may or may not be quoted here. We could try to
* munge the server response and compare with quoted (or vise versa)
* but it is probably more efficient to just strncmp against both. */
/* The mailbox name may or may not be quoted here. We could try to
* munge the server response and compare with quoted (or vise versa)
* but it is probably more efficient to just strncmp against both. */
- if (s
afe_strncmp (mbox_unquoted, s, mutt_str
len (mbox_unquoted)) == 0
- || s
afe_strncmp (mbox, s, mutt_str
len (mbox)) == 0) {
+ if (s
tr_ncmp (mbox_unquoted, s, str_
len (mbox_unquoted)) == 0
+ || s
tr_ncmp (mbox, s, str_
len (mbox)) == 0) {
s = imap_next_word (s);
s = imap_next_word (s);
if (isdigit ((unsigned char) *s)) {
s = imap_next_word (s);
s = imap_next_word (s);
if (isdigit ((unsigned char) *s)) {
@@
-1323,11
+1323,11
@@
int imap_subscribe (char *path, int subscribe)
if (imap_exec (idata, buf, 0) < 0)
goto fail;
if (imap_exec (idata, buf, 0) < 0)
goto fail;
-
FREE
(&mx.mbox);
+
mem_free
(&mx.mbox);
return 0;
fail:
return 0;
fail:
-
FREE
(&mx.mbox);
+
mem_free
(&mx.mbox);
return -1;
}
return -1;
}
@@
-1353,12
+1353,12
@@
static int imap_complete_hosts (char *dest, size_t len) {
int matchlen;
int i = 0;
int matchlen;
int i = 0;
- matchlen =
mutt_str
len (dest);
+ matchlen =
str_
len (dest);
if (list_empty (Incoming))
return (-1);
for (i = 0; i < Incoming->length; i++) {
mailbox = (BUFFY*) Incoming->data[i];
if (list_empty (Incoming))
return (-1);
for (i = 0; i < Incoming->length; i++) {
mailbox = (BUFFY*) Incoming->data[i];
- if (!s
afe_str
ncmp (dest, mailbox->path, matchlen)) {
+ if (!s
tr_
ncmp (dest, mailbox->path, matchlen)) {
if (rc) {
strfcpy (dest, mailbox->path, len);
rc = 0;
if (rc) {
strfcpy (dest, mailbox->path, len);
rc = 0;
@@
-1379,7
+1379,7
@@
static int imap_complete_hosts (char *dest, size_t len) {
url.user = NULL;
url.path = NULL;
url_ciss_tostring (&url, urlstr, sizeof (urlstr), 0);
url.user = NULL;
url.path = NULL;
url_ciss_tostring (&url, urlstr, sizeof (urlstr), 0);
- if (!s
afe_str
ncmp (dest, urlstr, matchlen)) {
+ if (!s
tr_
ncmp (dest, urlstr, matchlen)) {
if (rc) {
strfcpy (dest, urlstr, len);
rc = 0;
if (rc) {
strfcpy (dest, urlstr, len);
rc = 0;
@@
-1414,7
+1414,7
@@
int imap_complete (char *dest, size_t dlen, char *path) {
/* don't open a new socket just for completion. Instead complete over
* known mailboxes/hooks/etc */
if (!(idata = imap_conn_find (&(mx.account), M_IMAP_CONN_NONEW))) {
/* don't open a new socket just for completion. Instead complete over
* known mailboxes/hooks/etc */
if (!(idata = imap_conn_find (&(mx.account), M_IMAP_CONN_NONEW))) {
-
FREE
(&mx.mbox);
+
mem_free
(&mx.mbox);
strfcpy (dest, path, dlen);
return imap_complete_hosts (dest, dlen);
}
strfcpy (dest, path, dlen);
return imap_complete_hosts (dest, dlen);
}
@@
-1447,14
+1447,14
@@
int imap_complete (char *dest, size_t dlen, char *path) {
/* if the folder isn't selectable, append delimiter to force browse
* to enter it on second tab. */
if (noselect) {
/* if the folder isn't selectable, append delimiter to force browse
* to enter it on second tab. */
if (noselect) {
- clen =
mutt_str
len (list_word);
+ clen =
str_
len (list_word);
list_word[clen++] = delim;
list_word[clen] = '\0';
}
/* copy in first word */
if (!completions) {
strfcpy (completion, list_word, sizeof (completion));
list_word[clen++] = delim;
list_word[clen] = '\0';
}
/* copy in first word */
if (!completions) {
strfcpy (completion, list_word, sizeof (completion));
- matchlen =
mutt_str
len (completion);
+ matchlen =
str_
len (completion);
completions++;
continue;
}
completions++;
continue;
}
@@
-1470,7
+1470,7
@@
int imap_complete (char *dest, size_t dlen, char *path) {
imap_qualify_path (dest, dlen, &mx, completion);
mutt_pretty_mailbox (dest);
imap_qualify_path (dest, dlen, &mx, completion);
mutt_pretty_mailbox (dest);
-
FREE
(&mx.mbox);
+
mem_free
(&mx.mbox);
return 0;
}
return 0;
}