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]
/
send.c
diff --git
a/send.c
b/send.c
index
851db2d
..
a6da714
100644
(file)
--- a/
send.c
+++ b/
send.c
@@
-56,15
+56,9
@@
static void append_signature (FILE * f)
FILE *tmpfp;
pid_t thepid;
FILE *tmpfp;
pid_t thepid;
- if (SignOffString) {
- fprintf (f, "\n%s", SignOffString);
- }
-
if (Signature && (tmpfp = mutt_open_read (Signature, &thepid))) {
if (option (OPTSIGDASHES))
fputs ("\n-- \n", f);
if (Signature && (tmpfp = mutt_open_read (Signature, &thepid))) {
if (option (OPTSIGDASHES))
fputs ("\n-- \n", f);
- else if (SignOffString)
- fputs ("\n", f);
mutt_copy_stream (tmpfp, f);
fclose (tmpfp);
if (thepid != -1)
mutt_copy_stream (tmpfp, f);
fclose (tmpfp);
if (thepid != -1)
@@
-435,7
+429,6
@@
void mutt_make_post_indent (CONTEXT * ctx, HEADER * cur, FILE * out)
if (PostIndentString) {
mutt_make_string (buffer, sizeof (buffer), PostIndentString, ctx, cur);
fputs (buffer, out);
if (PostIndentString) {
mutt_make_string (buffer, sizeof (buffer), PostIndentString, ctx, cur);
fputs (buffer, out);
- fputc ('\n', out);
}
}
}
}
@@
-1095,6
+1088,7
@@
int ci_send_message (int flags, /* send mode */
/* save current value of "pgp_sign_as" */
char *signas = NULL;
char *tag = NULL, *err = NULL;
/* save current value of "pgp_sign_as" */
char *signas = NULL;
char *tag = NULL, *err = NULL;
+ char *ctype;
int rv = -1;
int rv = -1;
@@
-1175,7
+1169,10
@@
int ci_send_message (int flags, /* send mode */
pbody->next = msg->content; /* don't kill command-line attachments */
msg->content = pbody;
pbody->next = msg->content; /* don't kill command-line attachments */
msg->content = pbody;
- mutt_parse_content_type (ContentType, msg->content);
+ ctype = str_dup (ContentType);
+ mutt_parse_content_type (ctype, msg->content);
+ mem_free (&ctype);
+
msg->content->unlink = 1;
msg->content->use_disp = 0;
msg->content->disposition = DISPINLINE;
msg->content->unlink = 1;
msg->content->use_disp = 0;
msg->content->disposition = DISPINLINE;