projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more useless and cluttered things.
[apps/madmutt.git]
/
sendlib.c
diff --git
a/sendlib.c
b/sendlib.c
index
1926dc6
..
6ba421a
100644
(file)
--- a/
sendlib.c
+++ b/
sendlib.c
@@
-758,10
+758,10
@@
CONTENT *mutt_get_content_info (const char *fname, BODY * b)
if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset)) {
const char *chs = parameter_getval(b->parameter, "charset");
if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset)) {
const char *chs = parameter_getval(b->parameter, "charset");
- char *fchs = b->use_disp && !m_strisempty(
MChar
set.file_charset)
- ? FileCharset :
MChar
set.charset;
- if (
MCharset.charset && (chs || MChar
set.send_charset) &&
- convert_file_from_to (fp, fchs, chs ? chs :
MChar
set.send_charset,
+ char *fchs = b->use_disp && !m_strisempty(
mod_c
set.file_charset)
+ ? FileCharset :
mod_c
set.charset;
+ if (
mod_cset.charset && (chs || mod_c
set.send_charset) &&
+ convert_file_from_to (fp, fchs, chs ? chs :
mod_c
set.send_charset,
&fromcode, &tocode, info) != -1) {
if (!chs) {
charset_canonicalize (chsbuf, sizeof (chsbuf), tocode);
&fromcode, &tocode, info) != -1) {
if (!chs) {
charset_canonicalize (chsbuf, sizeof (chsbuf), tocode);
@@
-784,8
+784,8
@@
CONTENT *mutt_get_content_info (const char *fname, BODY * b)
if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset))
parameter_setval(&b->parameter, "charset",
(!info->hibin ? "us-ascii"
if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset))
parameter_setval(&b->parameter, "charset",
(!info->hibin ? "us-ascii"
- :
MCharset.charset && !charset_is_us_ascii(MChar
set.charset)
- ?
MChar
set.charset : "unknown-8bit"));
+ :
mod_cset.charset && !charset_is_us_ascii(mod_c
set.charset)
+ ?
mod_c
set.charset : "unknown-8bit"));
return info;
}
return info;
}
@@
-821,7
+821,7
@@
int mutt_lookup_mime_type (BODY * att, const char *path)
*/
switch (count) {
case 0:
*/
switch (count) {
case 0:
- snprintf(buf, sizeof (buf), "%s/.mime.types", NONULL(
MC
ore.homedir));
+ snprintf(buf, sizeof (buf), "%s/.mime.types", NONULL(
mod_c
ore.homedir));
break;
case 1:
m_strcpy(buf, sizeof(buf), SYSCONFDIR "/madmutt-mime.types");
break;
case 1:
m_strcpy(buf, sizeof(buf), SYSCONFDIR "/madmutt-mime.types");
@@
-917,7
+917,7
@@
void mutt_message_to_7bit (BODY * a, FILE * fp)
a->length = sb.st_size;
}
a->length = sb.st_size;
}
- fpout = m_tempfile(temp, sizeof(temp), NONULL(
MC
ore.tmpdir), NULL);
+ fpout = m_tempfile(temp, sizeof(temp), NONULL(
mod_c
ore.tmpdir), NULL);
if (!fpout) {
mutt_error(_("Could not create temporary file"));
goto cleanup;
if (!fpout) {
mutt_error(_("Could not create temporary file"));
goto cleanup;
@@
-982,7
+982,7
@@
static void transform_to_7bit (BODY * a, FILE * fpin)
a->noconv = 1;
a->force_charset = 1;
a->noconv = 1;
a->force_charset = 1;
- s.fpout = m_tempfile(buff, sizeof(buff), NONULL(
MC
ore.tmpdir), NULL);
+ s.fpout = m_tempfile(buff, sizeof(buff), NONULL(
mod_c
ore.tmpdir), NULL);
if (!s.fpout) {
mutt_error(_("Could not create temporary file"));
return;
if (!s.fpout) {
mutt_error(_("Could not create temporary file"));
return;
@@
-1104,7
+1104,7
@@
BODY *mutt_make_message_attach (CONTEXT * ctx, HEADER * hdr, int attach_msg)
(hdr->security & ENCRYPT)) {
}
(hdr->security & ENCRYPT)) {
}
- fp = m_tempfile(buffer, sizeof(buffer), NONULL(
MC
ore.tmpdir), NULL);
+ fp = m_tempfile(buffer, sizeof(buffer), NONULL(
mod_c
ore.tmpdir), NULL);
if (!fp)
return NULL;
if (!fp)
return NULL;
@@
-1416,12
+1416,6
@@
int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
fprintf (fp, "Followup-To: %s\n", env->followup_to);
else if (mode == 1 && option (OPTNEWSSEND) && edit_header(mode, "Followup-To:"))
fputs ("Followup-To:\n", fp);
fprintf (fp, "Followup-To: %s\n", env->followup_to);
else if (mode == 1 && option (OPTNEWSSEND) && edit_header(mode, "Followup-To:"))
fputs ("Followup-To:\n", fp);
-
- if (env->x_comment_to)
- fprintf (fp, "X-Comment-To: %s\n", env->x_comment_to);
- else if (mode == 1 && option (OPTNEWSSEND) && option (OPTXCOMMENTTO) &&
- edit_header(mode, "X-Comment-To:"))
- fputs ("X-Comment-To:\n", fp);
#endif
if (env->subject)
#endif
if (env->subject)
@@
-1487,9
+1481,9
@@
int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
}
if (mode == 0 && !privacy && option (OPTXMAILER) && !has_agent) {
}
if (mode == 0 && !privacy && option (OPTXMAILER) && !has_agent) {
- if (
MC
ore.operating_system) {
+ if (
mod_c
ore.operating_system) {
fprintf(fp, "User-Agent: %s (%s)\n", mutt_make_version(),
fprintf(fp, "User-Agent: %s (%s)\n", mutt_make_version(),
-
MC
ore.operating_system);
+
mod_c
ore.operating_system);
} else {
fprintf(fp, "User-Agent: %s\n", mutt_make_version());
}
} else {
fprintf(fp, "User-Agent: %s\n", mutt_make_version());
}
@@
-1528,18
+1522,18
@@
const char *mutt_fqdn(short may_hide_host)
{
char *p = NULL, *q;
{
char *p = NULL, *q;
- if (
MCore.hostname && MC
ore.hostname[0] != '@') {
- p =
MC
ore.hostname;
+ if (
mod_core.hostname && mod_c
ore.hostname[0] != '@') {
+ p =
mod_c
ore.hostname;
if (may_hide_host && option (OPTHIDDENHOST)) {
if (may_hide_host && option (OPTHIDDENHOST)) {
- if ((p = strchr(
MC
ore.hostname, '.')))
+ if ((p = strchr(
mod_c
ore.hostname, '.')))
p++;
/* sanity check: don't hide the host if
the fqdn is something like detebe.org. */
if (!p || !(q = strchr(p, '.')))
p++;
/* sanity check: don't hide the host if
the fqdn is something like detebe.org. */
if (!p || !(q = strchr(p, '.')))
- p =
MC
ore.hostname;
+ p =
mod_c
ore.hostname;
}
}
}
}
@@
-1642,7
+1636,7
@@
static char *mutt_gen_msgid (void)
const char *fqdn;
if (!(fqdn = mutt_fqdn(0)))
const char *fqdn;
if (!(fqdn = mutt_fqdn(0)))
- fqdn = NONULL(
MC
ore.shorthost);
+ fqdn = NONULL(
mod_c
ore.shorthost);
mutt_gen_localpart(localpart, sizeof(localpart), MsgIdFormat);
snprintf(buf, sizeof(buf), "<%s@%s>", localpart, fqdn);
mutt_gen_localpart(localpart, sizeof(localpart), MsgIdFormat);
snprintf(buf, sizeof(buf), "<%s@%s>", localpart, fqdn);
@@
-2016,7
+2010,7
@@
static int _mutt_bounce_message (FILE * fp, HEADER * h, address_t * to,
if (!fp)
fp = msg->fp;
if (!fp)
fp = msg->fp;
- f = m_tempfile(tempfile, sizeof(tempfile), NONULL(
MC
ore.tmpdir), NULL);
+ f = m_tempfile(tempfile, sizeof(tempfile), NONULL(
mod_c
ore.tmpdir), NULL);
if (f) {
int ch_flags = CH_XMIT | CH_NONEWLINE | CH_NOQFROM;
if (f) {
int ch_flags = CH_XMIT | CH_NONEWLINE | CH_NOQFROM;
@@
-2106,7
+2100,7
@@
int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid,
* the message body begins with "From "
*/
if (f.magic == M_MBOX) {
* the message body begins with "From "
*/
if (f.magic == M_MBOX) {
- tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(
MC
ore.tmpdir), NULL);
+ tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(
mod_c
ore.tmpdir), NULL);
if (!tempfp) {
mutt_error(_("Could not create temporary file"));
mx_close_mailbox (&f, NULL);
if (!tempfp) {
mutt_error(_("Could not create temporary file"));
mx_close_mailbox (&f, NULL);