projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Begin to work on a pop reimplementation, using jobs and the event loop
[apps/madmutt.git]
/
muttlib.c
diff --git
a/muttlib.c
b/muttlib.c
index
1c23817
..
dc07e8a
100644
(file)
--- a/
muttlib.c
+++ b/
muttlib.c
@@
-83,7
+83,7
@@
ssize_t _mutt_expand_path(char *buf, ssize_t len, const char *s, int rx)
case '=':
case '+':
/* if folder = imap[s]://host/: don't append slash */
case '=':
case '+':
/* if folder = imap[s]://host/: don't append slash */
- if (imap_is_magic(NONULL(Maildir), NULL) == M_IMAP
+ if (imap_
mx.mx_
is_magic(NONULL(Maildir), NULL) == M_IMAP
&& Maildir[m_strlen(Maildir) - 1] == '/') {
m_strcpy(p, sizeof(p), Maildir);
} else {
&& Maildir[m_strlen(Maildir) - 1] == '/') {
m_strcpy(p, sizeof(p), Maildir);
} else {
@@
-249,7
+249,7
@@
int mutt_check_overwrite (const char *attname, const char *path,
tmp[0] = 0;
if (mutt_get_field (_("File under directory: "), tmp, sizeof (tmp),
M_FILE | M_CLEAR) != 0 || !tmp[0])
tmp[0] = 0;
if (mutt_get_field (_("File under directory: "), tmp, sizeof (tmp),
M_FILE | M_CLEAR) != 0 || !tmp[0])
- return
(-1)
;
+ return
-1
;
mutt_concat_path(fname, flen, path, tmp);
}
else
mutt_concat_path(fname, flen, path, tmp);
}
else
@@
-350,7
+350,7
@@
int mutt_save_confirm (const char *s, struct stat *st)
}
}
}
}
}
}
- return
(ret)
;
+ return
ret
;
}
void mutt_sleep (short s)
}
void mutt_sleep (short s)
@@
-364,30
+364,24
@@
static int mutt_cmp_addr (const address_t * a, const address_t * b)
while (a && b) {
if (m_strcmp(a->mailbox, b->mailbox) ||
m_strcmp(a->personal, b->personal))
while (a && b) {
if (m_strcmp(a->mailbox, b->mailbox) ||
m_strcmp(a->personal, b->personal))
- return
(0)
;
+ return
0
;
a = a->next;
b = b->next;
}
a = a->next;
b = b->next;
}
- if (a || b)
- return (0);
-
- return (1);
+ return !(a || b);
}
static int mutt_cmp_list (const string_list_t * a, const string_list_t * b)
{
while (a && b) {
if (m_strcmp(a->data, b->data))
}
static int mutt_cmp_list (const string_list_t * a, const string_list_t * b)
{
while (a && b) {
if (m_strcmp(a->data, b->data))
- return
(0)
;
+ return
0
;
a = a->next;
b = b->next;
}
a = a->next;
b = b->next;
}
- if (a || b)
- return (0);
-
- return (1);
+ return !(a || b);
}
static int mutt_cmp_env (const ENVELOPE * e1, const ENVELOPE * e2)
}
static int mutt_cmp_env (const ENVELOPE * e1, const ENVELOPE * e2)
@@
-402,16
+396,11
@@
static int mutt_cmp_env (const ENVELOPE * e1, const ENVELOPE * e2)
!mutt_cmp_addr (e1->to, e2->to) ||
!mutt_cmp_addr (e1->cc, e2->cc) ||
!mutt_cmp_addr (e1->return_path, e2->return_path))
!mutt_cmp_addr (e1->to, e2->to) ||
!mutt_cmp_addr (e1->cc, e2->cc) ||
!mutt_cmp_addr (e1->return_path, e2->return_path))
- return
(0)
;
+ return
0
;
else
else
- return (1);
- }
- else {
- if (e1 == NULL && e2 == NULL)
- return (1);
- else
- return (0);
+ return 1;
}
}
+ return e1 == NULL && e2 == NULL;
}
static int mutt_cmp_body (const BODY * b1, const BODY * b2)
}
static int mutt_cmp_body (const BODY * b1, const BODY * b2)
@@
-422,8
+411,8
@@
static int mutt_cmp_body (const BODY * b1, const BODY * b2)
m_strcmp(b1->description, b2->description) ||
!parameter_equal(b1->parameter, b2->parameter) ||
b1->length != b2->length)
m_strcmp(b1->description, b2->description) ||
!parameter_equal(b1->parameter, b2->parameter) ||
b1->length != b2->length)
- return
(0)
;
- return
(1)
;
+ return
0
;
+ return
1
;
}
int mutt_cmp_header (const HEADER * h1, const HEADER * h2) {
if (h1 && h2) {
}
int mutt_cmp_header (const HEADER * h1, const HEADER * h2) {
if (h1 && h2) {
@@
-437,16
+426,11
@@
int mutt_cmp_header (const HEADER * h1, const HEADER * h2) {
h1->mime != h2->mime ||
!mutt_cmp_env (h1->env, h2->env) ||
!mutt_cmp_body (h1->content, h2->content))
h1->mime != h2->mime ||
!mutt_cmp_env (h1->env, h2->env) ||
!mutt_cmp_body (h1->content, h2->content))
- return (0);
- else
- return (1);
- }
- else {
- if (h1 == NULL && h2 == NULL)
- return (1);
+ return 0;
else
else
- return
(0)
;
+ return
1
;
}
}
+ return h1 == NULL && h2 == NULL;
}
}
@@
-554,7
+538,7
@@
int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags)
}
} while (pc && *pc != '`');
if (!pc) {
}
} while (pc && *pc != '`');
if (!pc) {
- return
(-1)
;
+ return
-1
;
}
cmd = p_dupstr(tok->dptr, pc - tok->dptr);
}
cmd = p_dupstr(tok->dptr, pc - tok->dptr);