projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
less and less cruft: always compile socket support in
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
f7d7328
..
afcc9b1
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-13,15
+13,19
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-mime/mime.h>
#include "mutt.h"
#include "mutt.h"
-#include "ascii.h"
#include "enter.h"
#include "handler.h"
#include "mutt_menu.h"
#include "rfc1524.h"
#include "enter.h"
#include "handler.h"
#include "mutt_menu.h"
#include "rfc1524.h"
-#include "mime.h"
-#include "mapping.h"
#include "sort.h"
#include "thread.h"
#include "mx.h"
#include "sort.h"
#include "thread.h"
#include "mx.h"
@@
-31,9
+35,6
@@
#endif
#include "mutt_crypt.h"
#endif
#include "mutt_crypt.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <ctype.h>
#include "lib/debug.h"
#include <ctype.h>
@@
-298,8
+299,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
if (ctx) {
/* if a mailbox is currently open, look to see if the orignal message
the user attempted to reply to is in this mailbox */
if (ctx) {
/* if a mailbox is currently open, look to see if the orignal message
the user attempted to reply to is in this mailbox */
- p = tmp->data + 18;
- SKIPWS (p);
+ p = vskipspaces(tmp->data + 18);
if (!ctx->id_hash)
ctx->id_hash = mutt_make_id_hash (ctx);
*cur = hash_find (ctx->id_hash, p);
if (!ctx->id_hash)
ctx->id_hash = mutt_make_id_hash (ctx);
*cur = hash_find (ctx->id_hash, p);
@@
-318,9
+318,8
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
code |= SENDREPLY;
}
else if (ascii_strncasecmp ("X-Mutt-Fcc:", tmp->data, 11) == 0) {
code |= SENDREPLY;
}
else if (ascii_strncasecmp ("X-Mutt-Fcc:", tmp->data, 11) == 0) {
- p = tmp->data + 11;
- SKIPWS (p);
- strfcpy (fcc, p, fcclen);
+ p = vskipspaces(tmp->data + 11);
+ m_strcpy(fcc, fcclen, p);
mutt_pretty_mailbox (fcc);
/* remove the X-Mutt-Fcc: header field */
mutt_pretty_mailbox (fcc);
/* remove the X-Mutt-Fcc: header field */
@@
-333,11
+332,10
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
mutt_free_list (&tmp);
tmp = next;
}
mutt_free_list (&tmp);
tmp = next;
}
- else if ((WithCrypto & APPLICATION_PGP)
- && (str_ncmp ("Pgp:", tmp->data, 4) == 0 /* this is generated
- * by old mutt versions
- */
- || str_ncmp ("X-Mutt-PGP:", tmp->data, 11) == 0)) {
+ else if ((m_strncmp("Pgp:", tmp->data, 4) == 0 /* this is generated
+ * by old mutt versions
+ */
+ || m_strncmp("X-Mutt-PGP:", tmp->data, 11) == 0)) {
hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
hdr->security |= APPLICATION_PGP;
hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
hdr->security |= APPLICATION_PGP;
@@
-351,8
+349,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
mutt_free_list (&tmp);
tmp = next;
}
mutt_free_list (&tmp);
tmp = next;
}
- else if ((WithCrypto & APPLICATION_SMIME)
- && str_ncmp ("X-Mutt-SMIME:", tmp->data, 13) == 0) {
+ else if (m_strncmp("X-Mutt-SMIME:", tmp->data, 13) == 0) {
hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
hdr->security |= APPLICATION_SMIME;
hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
hdr->security |= APPLICATION_SMIME;
@@
-368,7
+365,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
}
#ifdef MIXMASTER
}
#ifdef MIXMASTER
- else if (
str_ncmp
("X-Mutt-Mix:", tmp->data, 11) == 0) {
+ else if (
m_strncmp
("X-Mutt-Mix:", tmp->data, 11) == 0) {
char *t;
mutt_free_list (&hdr->chain);
char *t;
mutt_free_list (&hdr->chain);
@@
-406,12
+403,7
@@
int mutt_parse_crypt_hdr (char *p, int set_signas)
char pgp_sign_as[LONG_STRING] = "\0", *q;
char smime_cryptalg[LONG_STRING] = "\0";
char pgp_sign_as[LONG_STRING] = "\0", *q;
char smime_cryptalg[LONG_STRING] = "\0";
- if (!WithCrypto)
- return 0;
-
- SKIPWS (p);
- for (; *p; p++) {
-
+ for (p = vskipspaces(p); *p; p++) {
switch (*p) {
case 'e':
case 'E':
switch (*p) {
case 'e':
case 'E':
@@
-490,11
+482,11
@@
int mutt_parse_crypt_hdr (char *p, int set_signas)
}
/* the cryptalg field must not be empty */
}
/* the cryptalg field must not be empty */
- if (
(WithCrypto & APPLICATION_SMIME) &&
*smime_cryptalg)
-
str_replace
(&SmimeCryptAlg, smime_cryptalg);
+ if (*smime_cryptalg)
+
m_strreplace
(&SmimeCryptAlg, smime_cryptalg);
- if (
(WithCrypto & APPLICATION_PGP) && (set_signas || *pgp_sign_as)
)
-
str_replace
(&PgpSignAs, pgp_sign_as);
+ if (
set_signas || *pgp_sign_as
)
+
m_strreplace
(&PgpSignAs, pgp_sign_as);
return pgp;
}
return pgp;
}
@@
-512,7
+504,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
int rv = -1;
STATE s;
int rv = -1;
STATE s;
-
memset (&s, 0, sizeof (s)
);
+
p_clear(&s, 1
);
if (!fp && (msg = mx_open_message (ctx, hdr->msgno)) == NULL)
return (-1);
if (!fp && (msg = mx_open_message (ctx, hdr->msgno)) == NULL)
return (-1);
@@
-535,10
+527,10
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
/* decrypt pgp/mime encoded messages */
/* decrypt pgp/mime encoded messages */
- if ((
WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME) & hdr->security)
- && mutt_is_multipart_encrypted (newhdr->content))
{
- int ccap =
-
WithCrypto &
(APPLICATION_PGP | APPLICATION_SMIME) & hdr->security;
+ if ((
APPLICATION_PGP | APPLICATION_SMIME) & hdr->security
+ && mutt_is_multipart_encrypted (newhdr->content))
+ {
+
int ccap =
(APPLICATION_PGP | APPLICATION_SMIME) & hdr->security;
newhdr->security |= ENCRYPT | ccap;
if (!crypt_valid_passphrase (ccap))
goto err;
newhdr->security |= ENCRYPT | ccap;
if (!crypt_valid_passphrase (ccap))
goto err;
@@
-570,15
+562,13
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
* resending messages
*/
* resending messages
*/
- if (
WithCrypto &&
mutt_is_multipart_signed (newhdr->content)) {
+ if (mutt_is_multipart_signed (newhdr->content)) {
newhdr->security |= SIGN;
newhdr->security |= SIGN;
- if ((WithCrypto & APPLICATION_PGP)
- &&
- ascii_strcasecmp (mutt_get_parameter
+ if (ascii_strcasecmp (mutt_get_parameter
("protocol", newhdr->content->parameter),
"application/pgp-signature") == 0)
newhdr->security |= APPLICATION_PGP;
("protocol", newhdr->content->parameter),
"application/pgp-signature") == 0)
newhdr->security |= APPLICATION_PGP;
- else
if ((WithCrypto & APPLICATION_SMIME))
+ else
newhdr->security |= APPLICATION_SMIME;
/* destroy the signature */
newhdr->security |= APPLICATION_SMIME;
/* destroy the signature */
@@
-611,8
+601,8
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
file[0] = '\0';
if (b->filename) {
file[0] = '\0';
if (b->filename) {
-
strfcpy (file, b->filename, sizeof (file)
);
- b->d_filename =
str_dup
(b->filename);
+
m_strcpy(file, sizeof(file), b->filename
);
+ b->d_filename =
m_strdup
(b->filename);
}
else {
/* avoid Content-Disposition: header with temporary filename */
}
else {
/* avoid Content-Disposition: header with temporary filename */
@@
-640,15
+630,14
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
goto bail;
goto bail;
- if ((WithCrypto & APPLICATION_PGP)
- && (mutt_is_application_pgp (b) & (ENCRYPT | SIGN))) {
+ if (mutt_is_application_pgp (b) & (ENCRYPT | SIGN)) {
mutt_body_handler (b, &s);
newhdr->security |= mutt_is_application_pgp (newhdr->content);
b->type = TYPETEXT;
mutt_body_handler (b, &s);
newhdr->security |= mutt_is_application_pgp (newhdr->content);
b->type = TYPETEXT;
-
str_replace
(&b->subtype, "plain");
+
m_strreplace
(&b->subtype, "plain");
mutt_delete_parameter ("x-action", &b->parameter);
}
else
mutt_delete_parameter ("x-action", &b->parameter);
}
else
@@
-657,7
+646,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
if (safe_fclose (&s.fpout) != 0)
goto bail;
if (safe_fclose (&s.fpout) != 0)
goto bail;
-
str_replace
(&b->filename, file);
+
m_strreplace
(&b->filename, file);
b->unlink = 1;
mutt_stamp_attachment (b);
b->unlink = 1;
mutt_stamp_attachment (b);
@@
-670,12
+659,9
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
/* Fix encryption flags. */
/* No inline if multipart. */
/* Fix encryption flags. */
/* No inline if multipart. */
- if (
WithCrypto &&
(newhdr->security & INLINE) && newhdr->content->next)
+ if ((newhdr->security & INLINE) && newhdr->content->next)
newhdr->security &= ~INLINE;
newhdr->security &= ~INLINE;
- /* Do we even support multiple mechanisms? */
- newhdr->security &= WithCrypto | ~(APPLICATION_PGP | APPLICATION_SMIME);
-
/* Theoretically, both could be set. Take the one the user wants to set by default. */
if ((newhdr->security & APPLICATION_PGP)
&& (newhdr->security & APPLICATION_SMIME)) {
/* Theoretically, both could be set. Take the one the user wants to set by default. */
if ((newhdr->security & APPLICATION_PGP)
&& (newhdr->security & APPLICATION_SMIME)) {