projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
safe_fclose -> m_fclose, and is now inlined.
[apps/madmutt.git]
/
send.c
diff --git
a/send.c
b/send.c
index
62748d4
..
f86d00c
100644
(file)
--- a/
send.c
+++ b/
send.c
@@
-25,7
+25,7
@@
#include "attach.h"
#ifdef USE_NNTP
#include "attach.h"
#ifdef USE_NNTP
-#include
"nntp.h"
+#include
<nntp/nntp.h>
#endif
#ifdef MIXMASTER
#endif
#ifdef MIXMASTER
@@
-971,9
+971,9
@@
static int send_message (HEADER * msg)
int i;
/* Write out the message in MIME form. */
int i;
/* Write out the message in MIME form. */
-
mutt_mktemp (tempfile
);
- if (
(tempfp = safe_fopen (tempfile, "w")) == NULL
)
- return
(-1)
;
+
tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (
!tempfp
)
+ return
-1
;
#ifdef MIXMASTER
mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0,
#ifdef MIXMASTER
mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0,
@@
-1046,7
+1046,7
@@
static void fix_end_of_file (const char *data)
fseeko (fp, -1, SEEK_END);
if ((c = fgetc (fp)) != '\n')
fputc ('\n', fp);
fseeko (fp, -1, SEEK_END);
if ((c = fgetc (fp)) != '\n')
fputc ('\n', fp);
-
safe_fclose
(&fp);
+
m_fclose
(&fp);
}
int mutt_resend_message (FILE * fp, CONTEXT * ctx, HEADER * cur)
}
int mutt_resend_message (FILE * fp, CONTEXT * ctx, HEADER * cur)
@@
-1065,7
+1065,6
@@
int ci_send_message (int flags, /* send mode */
CONTEXT * ctx, /* current mailbox */
HEADER * cur)
{ /* current message */
CONTEXT * ctx, /* current mailbox */
HEADER * cur)
{ /* current message */
- char buffer[LONG_STRING];
char fcc[_POSIX_PATH_MAX] = ""; /* where to copy this message */
FILE *tempfp = NULL;
BODY *pbody;
char fcc[_POSIX_PATH_MAX] = ""; /* where to copy this message */
FILE *tempfp = NULL;
BODY *pbody;
@@
-1177,12
+1176,11
@@
int ci_send_message (int flags, /* send mode */
}
if (!tempfile) {
}
if (!tempfile) {
-
mutt_mktemp (buffer)
;
- tempfp =
safe_fopen (buffer, "w+"
);
+
char buffer[_POSIX_PATH_MAX]
;
+ tempfp =
m_tempfile(buffer, sizeof(buffer), NONULL(Tempdir), NULL
);
msg->content->filename = m_strdup(buffer);
msg->content->filename = m_strdup(buffer);
- }
- else {
- tempfp = safe_fopen (tempfile, "a+");
+ } else {
+ tempfp = safe_fopen(tempfile, "a+");
msg->content->filename = m_strdup(tempfile);
}
msg->content->filename = m_strdup(tempfile);
}
@@
-1372,7
+1370,7
@@
int ci_send_message (int flags, /* send mode */
msg->env->from->personal = m_strdup(Realname);
if (!(flags & SENDKEY))
msg->env->from->personal = m_strdup(Realname);
if (!(flags & SENDKEY))
-
safe_fclose
(&tempfp);
+
m_fclose
(&tempfp);
if (!(flags & SENDBATCH)) {
struct stat st;
if (!(flags & SENDBATCH)) {
struct stat st;
@@
-1787,7
+1785,7
@@
cleanup:
}
}
}
}
-
safe_fclose
(&tempfp);
+
m_fclose
(&tempfp);
header_delete(&msg);
return rv;
header_delete(&msg);
return rv;