* please see the file GPL in the top level source directory.
*/
-#define _SENDLIB_C 1
-
#include <lib-lib/lib-lib.h>
#include <signal.h>
#endif /* USE_LIBESMTP */
#ifdef USE_NNTP
-#include <nntp.h>
+#include <nntp/nntp.h>
#endif
#ifdef HAVE_SYSEXITS_H
#define EX_OK 0
#endif
-/* If you are debugging this file, comment out the following line. */
-/*#define NDEBUG*/
-
-#ifdef NDEBUG
-#define assert(x)
-#else
-#include <assert.h>
-#endif
-
-#define DISPOSITION(X) X==DISPATTACH?"attachment":"inline"
-
static void transform_to_7bit (BODY * a, FILE * fpin);
static void encode_quoted (fgetconv_t * fc, FILE * fout, int istext)
fputc ('\n', fout);
}
-static void encode_8bit (fgetconv_t * fc, FILE * fout, int istext)
+static void encode_8bit (fgetconv_t * fc, FILE * fout,
+ int istext __attribute__ ((unused)))
{
int ch;
if (a->description)
fprintf (f, "Content-Description: %s\n", a->description);
+#define DISPOSITION(X) X==DISPATTACH?"attachment":"inline"
fprintf (f, "Content-Disposition: %s", DISPOSITION (a->disposition));
if (a->use_disp) {
#undef write_as_text_part
fgetconv_close (&fc);
- fclose (fpin);
+ m_fclose(&fpin);
return (ferror (f) ? -1 : 0);
}
ib = bufi;
ob = bufu, obl = sizeof (bufu);
n = my_iconv(cd1, ibl ? &ib : 0, &ibl, &ob, &obl);
- assert (n == -1 || !n);
if (n == -1 && ((errno != EINVAL && errno != E2BIG) || ib == bufi)) {
- assert (errno == EILSEQ ||
- (errno == EINVAL && ib == bufi && ibl < ssizeof (bufi)));
ret = -1;
break;
}
}
b->file_charset = fromcode;
p_delete(&tocode);
- safe_fclose (&fp);
+ m_fclose(&fp);
return info;
}
}
update_content_info (info, &state, buffer, r);
update_content_info (info, &state, 0, 0);
- safe_fclose (&fp);
+ m_fclose(&fp);
if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset))
parameter_setval(&b->parameter, "charset",
p = NULL;
}
}
- fclose (f);
+ m_fclose(&f);
}
}
a->offset = 0;
if (stat (a->filename, &sb) == -1) {
mutt_perror ("stat");
- fclose (fpin);
+ m_fclose(&fpin);
}
a->length = sb.st_size;
}
- mutt_mktemp (temp);
- if (!(fpout = safe_fopen (temp, "w+"))) {
- mutt_perror ("fopen");
+ fpout = m_tempfile(temp, sizeof(temp), NONULL(Tempdir), NULL);
+ if (!fpout) {
+ mutt_error(_("Could not create temporary file"));
goto cleanup;
}
p_delete(&line);
if (fpin && !fp)
- fclose (fpin);
+ m_fclose(&fpin);
if (fpout)
- fclose (fpout);
+ m_fclose(&fpout);
else
return;
a->noconv = 1;
a->force_charset = 1;
- mutt_mktemp (buff);
- if ((s.fpout = safe_fopen (buff, "w")) == NULL) {
- mutt_perror ("fopen");
+ s.fpout = m_tempfile(buff, sizeof(buff), NONULL(Tempdir), NULL);
+ if (!s.fpout) {
+ mutt_error(_("Could not create temporary file"));
return;
}
s.fpin = fpin;
mutt_decode_attachment (a, &s);
- fclose (s.fpout);
+ m_fclose(&s.fpout);
a->d_filename = a->filename;
a->filename = m_strdup(buff);
a->unlink = 1;
return (NULL);
}
- mutt_mktemp (buffer);
- if ((fp = safe_fopen (buffer, "w+")) == NULL)
+ fp = m_tempfile(buffer, sizeof(buffer), NONULL(Tempdir), NULL);
+ if (!fp)
return NULL;
body = body_new();
mutt_update_encoding (body);
body->parts = body->hdr->content;
- fclose (fp);
+ m_fclose(&fp);
return (body);
}
fputc ('\n', fp);
}
-/* arbitrary number of elements to grow the array by */
-#define REF_INC 16
-
-#define TrimRef 10
-
/* need to write the list in reverse because they are stored in reverse order
* when parsed to speed up threading
*/
-void mutt_write_references (string_list_t * r, FILE * f)
+void mutt_write_references(string_list_t *r, FILE *f)
{
- string_list_t **ref = NULL;
- int refcnt = 0, refmax = 0;
-
- for (; (TrimRef == 0 || refcnt < TrimRef) && r; r = r->next) {
- if (refcnt == refmax)
- p_realloc(&ref, refmax += REF_INC);
- ref[refcnt++] = r;
- }
+ string_list_t *refs[10];
+ int i;
- while (refcnt-- > 0) {
- fputc (' ', f);
- fputs (ref[refcnt]->data, f);
- }
+ p_clear(refs, countof(refs));
+ for (i = 0; i < countof(refs) && r; r = r->next) {
+ refs[i++] = r;
+ }
- p_delete(&ref);
+ while (i-- > 0) {
+ fprintf(f, " %s", refs[i]->data);
+ }
}
static int edit_header(int mode, const char *s)
return p;
}
-/* normalized character (we're stricter than RFC2822, 3.6.4) */
-static char mutt_normalized_char(char c)
-{
- return (isalnum(c) || strchr(".!#$%&'*+-/=?^_`{|}~", c)) ? c : '.';
-}
-
static void mutt_gen_localpart(char *buf, unsigned int len, const char *fmt)
{
#define APPEND_FMT(fmt, arg) \
int c = *fmt++;
if (c != '%') {
- APPEND_BYTE(mutt_normalized_char(c));
+ /* normalized character (we're stricter than RFC2822, 3.6.4) */
+ APPEND_BYTE((isalnum(c) || strchr(".!#$%&'*+-/=?^_`{|}~", c)) ? c : '.');
continue;
}
break;
default: /* invalid formats are replaced by '.' */
APPEND_BYTE('.');
- m_strncat(buf, len, ".", 1);
}
}
static char *mutt_gen_msgid (void)
{
- char buf[SHORT_STRING];
- char localpart[SHORT_STRING];
- unsigned int localpart_length;
- const char *fqdn;
+ char buf[SHORT_STRING];
+ char localpart[SHORT_STRING];
+ const char *fqdn;
- if (!(fqdn = mutt_fqdn (0)))
- fqdn = NONULL (Hostname);
+ if (!(fqdn = mutt_fqdn(0)))
+ fqdn = NONULL(Hostname);
- localpart_length = sizeof (buf) - m_strlen(fqdn) - 4; /* the 4 characters are '<', '@', '>' and '\0' */
-
- mutt_gen_localpart (localpart, localpart_length, MsgIdFormat);
-
- snprintf (buf, sizeof (buf), "<%s@%s>", localpart, fqdn);
- return (m_strdup(buf));
+ mutt_gen_localpart(localpart, sizeof(localpart), MsgIdFormat);
+ snprintf(buf, sizeof(buf), "<%s@%s>", localpart, fqdn);
+ return m_strdup(buf);
}
-static RETSIGTYPE alarm_handler (int sig)
+static RETSIGTYPE alarm_handler (int sig __attribute__ ((unused)))
{
SigAlrm = 1;
}
mutt_FormatString (cmd, sizeof (cmd), NONULL (Inews), nntp_format_str, 0,
0);
- if (!*cmd) {
+ if (m_strisempty(cmd)) {
i = nntp_post (msg);
unlink (msg);
return i;
if (!fp)
fp = msg->fp;
- mutt_mktemp (tempfile);
- if ((f = safe_fopen (tempfile, "w")) != NULL) {
+ f = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ if (f) {
int ch_flags = CH_XMIT | CH_NONEWLINE | CH_NOQFROM;
if (!option (OPTBOUNCEDELIVERED))
mutt_copy_header (fp, h, f, ch_flags, NULL);
fputc ('\n', f);
mutt_copy_bytes (fp, f, h->content->length);
- fclose (f);
+ m_fclose(&f);
- ret = mutt_invoke_mta (env_from, to, NULL, NULL, tempfile,
- h->content->encoding == ENC8BIT);
+ ret = mutt_invoke_mta(env_from, to, NULL, NULL, tempfile,
+ h->content->encoding == ENC8BIT);
}
if (msg)
* the message body begins with "From "
*/
if (f.magic == M_MMDF || f.magic == M_MBOX) {
- mutt_mktemp (tempfile);
- if ((tempfp = safe_fopen (tempfile, "w+")) == NULL) {
- mutt_perror (tempfile);
+ tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ if (!tempfp) {
+ mutt_error(_("Could not create temporary file"));
mx_close_mailbox (&f, NULL);
- return (-1);
+ return -1;
}
}
fputc ('\n', msg->fp);
}
-#ifdef MIXMASTER
/* (postponement) if the mail is to be sent through a mixmaster
* chain, save that information
*/
-
if (post && hdr->chain && hdr->chain) {
string_list_t *p;
fputc ('\n', msg->fp);
}
-#endif
if (tempfp) {
char sasha[LONG_STRING];
fflush (tempfp);
if (ferror (tempfp)) {
- fclose (tempfp);
+ m_fclose(&tempfp);
unlink (tempfile);
mx_commit_message (msg, &f); /* XXX - really? */
mx_close_message (&msg);
/* copy the body and clean up */
rewind (tempfp);
r = mutt_copy_stream (tempfp, msg->fp);
- if (fclose (tempfp) != 0)
+ if (m_fclose(&tempfp) != 0)
r = -1;
/* if there was an error, leave the temp version */
if (!r)
projects / apps / madmutt.git / blobdiff