projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename a bunch of modules
[apps/madmutt.git]
/
crypt.cpkg
diff --git
a/crypt.cpkg
b/crypt.cpkg
index
819adae
..
b22723f
100644
(file)
--- a/
crypt.cpkg
+++ b/
crypt.cpkg
@@
-197,7
+197,7
@@
static void convert_to_7bit (BODY * a)
if (a->type == TYPEMULTIPART) {
a->encoding = ENC7BIT;
convert_to_7bit(a->parts);
if (a->type == TYPEMULTIPART) {
a->encoding = ENC7BIT;
convert_to_7bit(a->parts);
- } else if (a->type == TYPEMESSAGE && tok
=
= MIME_DELIVERY_STATUS) {
+ } else if (a->type == TYPEMESSAGE && tok
!
= MIME_DELIVERY_STATUS) {
if (a->encoding != ENC7BIT)
mutt_message_to_7bit(a, NULL);
} else if (a->encoding == ENC8BIT) {
if (a->encoding != ENC7BIT)
mutt_message_to_7bit(a, NULL);
} else if (a->encoding == ENC8BIT) {
@@
-219,7
+219,7
@@
static void print_utf8 (FILE * fp, const char *buf, ssize_t len)
char *tstr;
tstr = p_dupstr(buf, len);
char *tstr;
tstr = p_dupstr(buf, len);
- mutt_convert_string(&tstr, "utf-8",
MChar
set.charset, M_ICONV_HOOK_FROM);
+ mutt_convert_string(&tstr, "utf-8",
mod_c
set.charset, M_ICONV_HOOK_FROM);
fputs(tstr, fp);
p_delete(&tstr);
}
fputs(tstr, fp);
p_delete(&tstr);
}
@@
-475,7
+475,7
@@
static char *data_object_to_tempfile(gpgme_data_t data, FILE **ret_fp)
FILE *fp;
ssize_t nread = 0;
FILE *fp;
ssize_t nread = 0;
- fp = m_tempfile(tempfile, sizeof(tempfile), NONULL(
MC
ore.tmpdir), NULL);
+ fp = m_tempfile(tempfile, sizeof(tempfile), NONULL(
mod_c
ore.tmpdir), NULL);
if (!fp) {
mutt_perror (_("Can't create temporary file"));
return NULL;
if (!fp) {
mutt_perror (_("Can't create temporary file"));
return NULL;
@@
-690,7
+690,7
@@
static void print_time(time_t t, STATE *s)
char p[STRING];
setlocale(LC_TIME, "");
char p[STRING];
setlocale(LC_TIME, "");
-#ifdef
HAVE_LANGINFO_
D_T_FMT
+#ifdef D_T_FMT
strftime(p, sizeof(p), nl_langinfo(D_T_FMT), localtime(&t));
#else
strftime(p, sizeof(p), "%c", localtime(&t));
strftime(p, sizeof(p), nl_langinfo(D_T_FMT), localtime(&t));
#else
strftime(p, sizeof(p), "%c", localtime(&t));
@@
-1580,7
+1580,7
@@
pgp_check_traditional_one_body(FILE *fp, BODY *b, int tagged_only)
if (tagged_only && !b->tagged)
return 0;
if (tagged_only && !b->tagged)
return 0;
- tempfd = m_tempfd(tempfile, sizeof(tempfile), NONULL(
MC
ore.tmpdir), NULL);
+ tempfd = m_tempfd(tempfile, sizeof(tempfile), NONULL(
mod_c
ore.tmpdir), NULL);
if (mutt_decode_save_attachment (fp, b, tempfd, 0) != 0) {
unlink (tempfile);
return 0;
if (mutt_decode_save_attachment (fp, b, tempfd, 0) != 0) {
unlink (tempfile);
return 0;
@@
-1658,7
+1658,7
@@
static void copy_clearsigned(gpgme_data_t data, STATE * s, char *charset)
unlink (fname);
p_delete(&fname);
unlink (fname);
p_delete(&fname);
- fc = fgetconv_open (fp, charset,
MChar
set.charset, M_ICONV_HOOK_FROM);
+ fc = fgetconv_open (fp, charset,
mod_c
set.charset, M_ICONV_HOOK_FROM);
for (complete = 1, armor_header = 1;
fgetconvs (buf, sizeof (buf), fc) != NULL;
for (complete = 1, armor_header = 1;
fgetconvs (buf, sizeof (buf), fc) != NULL;
@@
-1874,7
+1874,7
@@
int crypt_pgp_application_pgp_handler(BODY *m, STATE *s)
int c;
rewind (pgpout);
int c;
rewind (pgpout);
- fc = fgetconv_open (pgpout, "utf-8",
MChar
set.charset, 0);
+ fc = fgetconv_open (pgpout, "utf-8",
mod_c
set.charset, 0);
while ((c = fgetconv (fc)) != EOF) {
state_putc (c, s);
if (c == '\n' && s->prefix)
while ((c = fgetconv (fc)) != EOF) {
state_putc (c, s);
if (c == '\n' && s->prefix)
@@
-1939,7
+1939,7
@@
int crypt_pgp_encrypted_handler (BODY * a, STATE * s)
/* Move forward to the application/pgp-encrypted body. */
a = a->next;
/* Move forward to the application/pgp-encrypted body. */
a = a->next;
- fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(
MC
ore.tmpdir), NULL);
+ fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(
mod_c
ore.tmpdir), NULL);
if (!fpout) {
if (s->flags & M_DISPLAY)
state_attach_puts (_("[-- Error: could not create temporary file! "
if (!fpout) {
if (s->flags & M_DISPLAY)
state_attach_puts (_("[-- Error: could not create temporary file! "
@@
-1999,7
+1999,7
@@
int crypt_smime_application_smime_handler (BODY * a, STATE * s)
int rc = 0;
a->warnsig = 0;
int rc = 0;
a->warnsig = 0;
- fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(
MC
ore.tmpdir), NULL);
+ fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(
mod_c
ore.tmpdir), NULL);
if (!fpout) {
if (s->flags & M_DISPLAY)
state_attach_puts (_("[-- Error: could not create temporary file! "
if (!fpout) {
if (s->flags & M_DISPLAY)
state_attach_puts (_("[-- Error: could not create temporary file! "
@@
-2680,7
+2680,7
@@
static void print_key_info (gpgme_key_t key, FILE * fp)
tt = key->subkeys->timestamp;
tm = localtime (&tt);
tt = key->subkeys->timestamp;
tm = localtime (&tt);
-#ifdef
HAVE_LANGINFO_
D_T_FMT
+#ifdef D_T_FMT
strftime (shortbuf, sizeof shortbuf, nl_langinfo (D_T_FMT), tm);
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
strftime (shortbuf, sizeof shortbuf, nl_langinfo (D_T_FMT), tm);
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
@@
-2692,7
+2692,7
@@
static void print_key_info (gpgme_key_t key, FILE * fp)
tt = key->subkeys->expires;
tm = localtime (&tt);
tt = key->subkeys->expires;
tm = localtime (&tt);
-#ifdef
HAVE_LANGINFO_
D_T_FMT
+#ifdef D_T_FMT
strftime (shortbuf, sizeof shortbuf, nl_langinfo (D_T_FMT), tm);
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
strftime (shortbuf, sizeof shortbuf, nl_langinfo (D_T_FMT), tm);
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
@@
-2803,7
+2803,7
@@
static void print_key_info (gpgme_key_t key, FILE * fp)
tt = subkey->timestamp;
tm = localtime (&tt);
tt = subkey->timestamp;
tm = localtime (&tt);
-#ifdef
HAVE_LANGINFO_
D_T_FMT
+#ifdef D_T_FMT
strftime (shortbuf, sizeof shortbuf, nl_langinfo (D_T_FMT), tm);
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
strftime (shortbuf, sizeof shortbuf, nl_langinfo (D_T_FMT), tm);
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
@@
-2815,7
+2815,7
@@
static void print_key_info (gpgme_key_t key, FILE * fp)
tt = subkey->expires;
tm = localtime (&tt);
tt = subkey->expires;
tm = localtime (&tt);
-#ifdef
HAVE_LANGINFO_
D_T_FMT
+#ifdef D_T_FMT
strftime (shortbuf, sizeof shortbuf, nl_langinfo (D_T_FMT), tm);
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
strftime (shortbuf, sizeof shortbuf, nl_langinfo (D_T_FMT), tm);
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
@@
-2870,7
+2870,7
@@
static void verify_key (cryptkey_t * key)
gpgme_key_t k = NULL;
int maxdepth = 100;
gpgme_key_t k = NULL;
int maxdepth = 100;
- fp = m_tempfile (tempfile, sizeof(tempfile), NONULL(
MC
ore.tmpdir), NULL);
+ fp = m_tempfile (tempfile, sizeof(tempfile), NONULL(
mod_c
ore.tmpdir), NULL);
if (!fp) {
mutt_perror (_("Can't create temporary file"));
return;
if (!fp) {
mutt_perror (_("Can't create temporary file"));
return;