X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=e92b825374bd4c76ef484b2debd32933381f52dd;hp=fc8462dda8ca6525f4a7416f401fbd475c0d483c;hb=01bd0a7410e476abaebf03d820bcf31a5ec4c7c0;hpb=10b7d54ecaa5c54622bf1239b57fa2e3359db0e1 diff --git a/sendlib.c b/sendlib.c index fc8462d..e92b825 100644 --- a/sendlib.c +++ b/sendlib.c @@ -13,38 +13,40 @@ # include "config.h" #endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include #include #include +#include +#include + #include +#include + #include "mutt.h" #include "handler.h" #include "recvattach.h" -#include "mutt_curses.h" #include "mx.h" #include "copy.h" #include "pager.h" #include "charset.h" -#include "mutt_crypt.h" +#include #include "mutt_idna.h" -#include "lib/debug.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #ifdef USE_LIBESMTP # include "mutt_libesmtp.h" #endif /* USE_LIBESMTP */ @@ -74,7 +76,7 @@ static char MsgIdPfx = 'A'; static void transform_to_7bit (BODY * a, FILE * fpin); -static void encode_quoted (FGETCONV * fc, FILE * fout, int istext) +static void encode_quoted (fgetconv_t * fc, FILE * fout, int istext) { int c, linelen = 0; char line[77], savechar; @@ -245,7 +247,7 @@ static void b64_putc (char c, FILE * fout) } -static void encode_base64 (FGETCONV * fc, FILE * fout, int istext) +static void encode_base64 (fgetconv_t * fc, FILE * fout, int istext) { int ch, ch1 = EOF; @@ -261,7 +263,7 @@ static void encode_base64 (FGETCONV * fc, FILE * fout, int istext) fputc ('\n', fout); } -static void encode_8bit (FGETCONV * fc, FILE * fout, int istext) +static void encode_8bit (fgetconv_t * fc, FILE * fout, int istext) { int ch; @@ -272,7 +274,6 @@ static void encode_8bit (FGETCONV * fc, FILE * fout, int istext) int mutt_write_mime_header (BODY * a, FILE * f) { - PARAMETER *p; char buffer[STRING]; char *t; char *fn; @@ -283,6 +284,8 @@ int mutt_write_mime_header (BODY * a, FILE * f) fprintf (f, "Content-Type: %s/%s", TYPE (a), a->subtype); if (a->parameter) { + PARAMETER *p; + len = 25 + m_strlen(a->subtype); /* approximate len. of content-type */ for (p = a->parameter; p; p = p->next) { @@ -371,12 +374,11 @@ int mutt_write_mime_body (BODY * a, FILE * f) char send_charset[SHORT_STRING]; FILE *fpin; BODY *t; - FGETCONV *fc; + fgetconv_t *fc; if (a->type == TYPEMULTIPART) { /* First, find the boundary to use */ if (!(p = mutt_get_parameter ("boundary", a->parameter))) { - debug_print (1, ("no boundary parameter found!\n")); mutt_error _("No boundary parameter found! [report this error]"); return (-1); @@ -402,7 +404,6 @@ int mutt_write_mime_body (BODY * a, FILE * f) } if ((fpin = fopen (a->filename, "r")) == NULL) { - debug_print (1, ("%s no longer exists!\n", a->filename)); mutt_error (_("%s no longer exists!"), a->filename); return -1; } @@ -440,7 +441,7 @@ void mutt_generate_boundary (PARAMETER ** parm) rs[BOUNDARYLEN] = 0; for (i = 0; i < BOUNDARYLEN; i++) - *p++ = __m_b64chars[LRAND() % sizeof(__m_b64chars)]; + *p++ = __m_b64chars[lrand48() % sizeof(__m_b64chars)]; *p = 0; mutt_set_parameter ("boundary", rs, parm); @@ -456,7 +457,7 @@ typedef struct { static void update_content_info (CONTENT * info, CONTENT_STATE * s, char *d, - size_t dlen) + ssize_t dlen) { int from = s->from; int whitespace = s->whitespace; @@ -582,7 +583,7 @@ static void update_content_info (CONTENT * info, CONTENT_STATE * s, char *d, * long as the input for any pair of charsets we might be interested * in. */ -static size_t convert_file_to (FILE * file, const char *fromcode, +static ssize_t convert_file_to (FILE * file, const char *fromcode, int ncodes, const char **tocodes, int *tocode, CONTENT * info) { @@ -591,18 +592,18 @@ static size_t convert_file_to (FILE * file, const char *fromcode, char bufi[256], bufu[512], bufo[4 * sizeof (bufi)]; const char *ib, *ub; char *ob; - size_t ibl, obl, ubl, ubl1, n, ret; + ssize_t ibl, obl, ubl, ubl1, n, ret; int i; CONTENT *infos; CONTENT_STATE *states; - size_t *score; + ssize_t *score; cd1 = mutt_iconv_open ("UTF-8", fromcode, 0); - if (cd1 == (iconv_t) (-1)) + if (cd1 == MUTT_ICONV_ERROR) return -1; cd = p_new(iconv_t, ncodes); - score = p_new(size_t, ncodes); + score = p_new(ssize_t, ncodes); states = p_new(CONTENT_STATE, ncodes); infos = p_new(CONTENT, ncodes); @@ -611,7 +612,7 @@ static size_t convert_file_to (FILE * file, const char *fromcode, cd[i] = mutt_iconv_open (tocodes[i], "UTF-8", 0); else /* Special case for conversion to UTF-8 */ - cd[i] = (iconv_t) (-1), score[i] = (size_t) (-1); + cd[i] = MUTT_ICONV_ERROR, score[i] = -1; rewind (file); ibl = 0; @@ -625,33 +626,33 @@ static size_t convert_file_to (FILE * file, const char *fromcode, ib = bufi; ob = bufu, obl = sizeof (bufu); n = my_iconv(cd1, ibl ? &ib : 0, &ibl, &ob, &obl); - assert (n == (size_t) (-1) || !n || ICONV_NONTRANS); - if (n == (size_t) (-1) && + assert (n == -1 || !n); + if (n == -1 && ((errno != EINVAL && errno != E2BIG) || ib == bufi)) { assert (errno == EILSEQ || - (errno == EINVAL && ib == bufi && ibl < sizeof (bufi))); - ret = (size_t) (-1); + (errno == EINVAL && ib == bufi && ibl < ssizeof (bufi))); + ret = -1; break; } ubl1 = ob - bufu; /* Convert from UTF-8 */ for (i = 0; i < ncodes; i++) - if (cd[i] != (iconv_t) (-1) && score[i] != (size_t) (-1)) { + if (cd[i] != MUTT_ICONV_ERROR && score[i] != -1) { ub = bufu, ubl = ubl1; ob = bufo, obl = sizeof (bufo); n = my_iconv(cd[i], (ibl || ubl) ? &ub : 0, &ubl, &ob, &obl); - if (n == (size_t) (-1)) { + if (n == -1) { assert (errno == E2BIG || (BUGGY_ICONV && (errno == EILSEQ || errno == ENOENT))); - score[i] = (size_t) (-1); + score[i] = -1; } else { score[i] += n; update_content_info (&infos[i], &states[i], bufo, ob - bufo); } } - else if (cd[i] == (iconv_t) (-1) && score[i] == (size_t) (-1)) + else if (cd[i] == MUTT_ICONV_ERROR && score[i] == -1) /* Special case for conversion to UTF-8 */ update_content_info (&infos[i], &states[i], bufu, ubl1); @@ -666,31 +667,31 @@ static size_t convert_file_to (FILE * file, const char *fromcode, if (!ret) { /* Find best score */ - ret = (size_t) (-1); + ret = -1; for (i = 0; i < ncodes; i++) { - if (cd[i] == (iconv_t) (-1) && score[i] == (size_t) (-1)) { + if (cd[i] == MUTT_ICONV_ERROR && score[i] == -1) { /* Special case for conversion to UTF-8 */ *tocode = i; ret = 0; break; } - else if (cd[i] == (iconv_t) (-1) || score[i] == (size_t) (-1)) + else if (cd[i] == MUTT_ICONV_ERROR || score[i] == -1) continue; - else if (ret == (size_t) (-1) || score[i] < ret) { + else if (ret == -1 || score[i] < ret) { *tocode = i; ret = score[i]; if (!ret) break; } } - if (ret != (size_t) (-1)) { + if (ret != -1) { memcpy (info, &infos[*tocode], sizeof (CONTENT)); update_content_info (info, &states[*tocode], 0, 0); /* EOF */ } } for (i = 0; i < ncodes; i++) - if (cd[i] != (iconv_t) (-1)) + if (cd[i] != MUTT_ICONV_ERROR) iconv_close (cd[i]); iconv_close (cd1); @@ -716,7 +717,7 @@ static size_t convert_file_to (FILE * file, const char *fromcode, * However, if fromcode is zero then fromcodes is assumed to be the * name of a single charset even if it contains a colon. */ -static size_t convert_file_from_to (FILE * file, +static ssize_t convert_file_from_to (FILE * file, const char *fromcodes, const char *tocodes, char **fromcode, char **tocode, CONTENT * info) @@ -724,7 +725,7 @@ static size_t convert_file_from_to (FILE * file, char *fcode; char **tcode; const char *c, *c1; - size_t ret; + ssize_t ret; int ncodes, i, cn; /* Count the tocodes */ @@ -743,7 +744,7 @@ static size_t convert_file_from_to (FILE * file, tcode[i] = m_substrdup(c, c1); } - ret = (size_t) (-1); + ret = -1; if (fromcode) { /* Try each fromcode in turn */ for (c = fromcodes; c; c = c1 ? c1 + 1 : 0) { @@ -753,7 +754,7 @@ static size_t convert_file_from_to (FILE * file, ret = convert_file_to (file, fcode, ncodes, (const char **) tcode, &cn, info); - if (ret != (size_t) (-1)) { + if (ret != -1) { *fromcode = fcode; *tocode = tcode[cn]; tcode[cn] = 0; @@ -766,7 +767,7 @@ static size_t convert_file_from_to (FILE * file, /* There is only one fromcode */ ret = convert_file_to (file, fromcodes, ncodes, (const char **) tcode, &cn, info); - if (ret != (size_t) (-1)) { + if (ret != -1) { *tocode = tcode[cn]; tcode[cn] = 0; } @@ -794,7 +795,7 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b) char *tocode = NULL; char buffer[100]; char chsbuf[STRING]; - size_t r; + ssize_t r; struct stat sb; @@ -812,7 +813,6 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b) } if ((fp = fopen (fname, "r")) == NULL) { - debug_print (1, ("%s: %s (errno %d).\n", fname, strerror (errno), errno)); return (NULL); } @@ -825,9 +825,9 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b) FileCharset : Charset) : Charset; if (Charset && (chs || SendCharset) && convert_file_from_to (fp, fchs, chs ? chs : SendCharset, - &fromcode, &tocode, info) != (size_t) (-1)) { + &fromcode, &tocode, info) != -1) { if (!chs) { - mutt_canonical_charset (chsbuf, sizeof (chsbuf), tocode); + charset_canonicalize (chsbuf, sizeof (chsbuf), tocode); mutt_set_parameter ("charset", chsbuf, &b->parameter); } b->file_charset = fromcode; @@ -847,7 +847,7 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b) if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset)) mutt_set_parameter ("charset", (!info->hibin ? "us-ascii" : Charset - && !mutt_is_us_ascii (Charset) ? Charset : + && !charset_is_us_ascii (Charset) ? Charset : "unknown-8bit"), &b->parameter); return info; @@ -887,7 +887,7 @@ int mutt_lookup_mime_type (BODY * att, const char *path) snprintf (buf, sizeof (buf), "%s/.mime.types", NONULL (Homedir)); break; case 1: - m_strcpy(buf, sizeof(buf), SYSCONFDIR "/muttng-mime.types"); + m_strcpy(buf, sizeof(buf), SYSCONFDIR "/madmutt-mime.types"); break; case 2: m_strcpy(buf, sizeof(buf), PKGDATADIR "/mime.types"); @@ -896,7 +896,6 @@ int mutt_lookup_mime_type (BODY * att, const char *path) m_strcpy(buf, sizeof(buf), SYSCONFDIR "/mime.types"); break; default: - debug_print (1, ("Internal error, count = %d.\n", count)); goto bye; /* shouldn't happen */ } @@ -1127,7 +1126,7 @@ void mutt_stamp_attachment (BODY * a) /* Get a body's character set */ -char *mutt_get_body_charset (char *d, size_t dlen, BODY * b) +char *mutt_get_body_charset (char *d, ssize_t dlen, BODY * b) { char *p = NULL; @@ -1138,7 +1137,7 @@ char *mutt_get_body_charset (char *d, size_t dlen, BODY * b) p = mutt_get_parameter ("charset", b->parameter); if (p) - mutt_canonical_charset (d, dlen, NONULL (p)); + charset_canonicalize (d, dlen, NONULL (p)); else m_strcpy(d, dlen, "us-ascii"); @@ -1153,7 +1152,7 @@ void mutt_update_encoding (BODY * a) char chsbuff[STRING]; /* override noconv when it's us-ascii */ - if (mutt_is_us_ascii (mutt_get_body_charset (chsbuff, sizeof (chsbuff), a))) + if (charset_is_us_ascii (mutt_get_body_charset (chsbuff, sizeof (chsbuff), a))) a->noconv = 0; if (!a->force_charset && !a->noconv) @@ -1231,7 +1230,7 @@ BODY *mutt_make_message_attach (CONTEXT * ctx, HEADER * hdr, int attach_msg) fflush (fp); rewind (fp); - body->hdr = mutt_new_header (); + body->hdr = header_new(); body->hdr->offset = 0; /* we don't need the user headers here */ body->hdr->env = mutt_read_rfc822_header (fp, body->hdr, 0, 0); @@ -1341,7 +1340,7 @@ BODY *mutt_remove_multipart (BODY * b) return b; } -char *mutt_make_date (char *s, size_t len) +char *mutt_make_date (char *s, ssize_t len) { time_t t = time (NULL); struct tm *l = localtime (&t); @@ -1403,9 +1402,9 @@ void mutt_write_address_list (address_t * adr, FILE * fp, int linelen, /* need to write the list in reverse because they are stored in reverse order * when parsed to speed up threading */ -void mutt_write_references (LIST * r, FILE * f) +void mutt_write_references (string_list_t * r, FILE * f) { - LIST **ref = NULL; + string_list_t **ref = NULL; int refcnt = 0, refmax = 0; for (; (TrimRef == 0 || refcnt < TrimRef) && r; r = r->next) { @@ -1443,7 +1442,7 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, { char buffer[LONG_STRING]; char *p; - LIST *tmp = env->userhdrs; + string_list_t *tmp = env->userhdrs; int has_agent = 0; /* user defined user-agent header field exists */ list2_t* hdrs = list_from_str (EditorHeaders, " "); @@ -1599,7 +1598,7 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, return (ferror (fp) == 0 ? 0 : -1); } -static void encode_headers (LIST * h) +static void encode_headers (string_list_t * h) { char *tmp; char *p; @@ -1912,7 +1911,7 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile) } static const char ** -add_args(const char **args, size_t *argslen, size_t *argsmax, address_t * addr) +add_args(const char **args, ssize_t *argslen, ssize_t *argsmax, address_t * addr) { for (; addr; addr = addr->next) { /* weed out group mailboxes, since those are for display only */ @@ -1926,7 +1925,7 @@ add_args(const char **args, size_t *argslen, size_t *argsmax, address_t * addr) } static const char ** -add_option(const char **args, size_t *argslen, size_t *argsmax, const char *s) +add_option(const char **args, ssize_t *argslen, ssize_t *argsmax, const char *s) { if (*argslen == *argsmax) { p_realloc(&args, *argsmax += 5); @@ -1942,7 +1941,7 @@ static int mutt_invoke_sendmail (address_t * from, /* the sender */ { /* message contains 8bit chars */ char *ps = NULL, *path = NULL, *s = NULL, *childout = NULL; const char **args = NULL; - size_t argslen = 0, argsmax = 0; + ssize_t argslen = 0, argsmax = 0; int i; #ifdef USE_NNTP @@ -2024,11 +2023,8 @@ static int mutt_invoke_sendmail (address_t * from, /* the sender */ if ((i = send_msg (path, args, msg, &childout)) != (EX_OK & 0xff)) { if (i != S_BKG) { - const char *e = mutt_strsysexit (i); - - e = mutt_strsysexit (i); mutt_error (_("Error sending message, child exited %d (%s)."), i, - NONULL (e)); + m_strsysexit(i)); if (childout) { struct stat st; @@ -2075,7 +2071,7 @@ int mutt_invoke_mta (address_t * from, /* the sender */ string. */ char *mutt_append_string (char *a, const char *b) { - size_t la = m_strlen(a); + ssize_t la = m_strlen(a); p_realloc(&a, la + m_strlen(b) + 1); strcpy (a + la, b); /* __STRCPY_CHECKED__ */ @@ -2103,14 +2099,14 @@ int mutt_needs_quote (const char *s) char *mutt_quote_string (const char *s) { char *r, *pr; - size_t rlen; + ssize_t rlen; rlen = m_strlen(s) + 3; pr = r = p_new(char, rlen); *pr++ = '"'; while (*s) { if (INVALID_CHAR (*s)) { - size_t o = pr - r; + ssize_t o = pr - r; p_realloc(&r, ++rlen); pr = r + o; @@ -2171,12 +2167,12 @@ void mutt_prepare_envelope (ENVELOPE * env, int final) void mutt_unprepare_envelope (ENVELOPE * env) { - LIST *item; + string_list_t *item; for (item = env->userhdrs; item; item = item->next) rfc2047_decode (&item->data); - address_delete (&env->mail_followup_to); + address_list_wipe(&env->mail_followup_to); /* back conversions */ rfc2047_decode_adrlist (env->to); @@ -2268,7 +2264,7 @@ int mutt_bounce_message (FILE * fp, HEADER * h, address_t * to) ret = _mutt_bounce_message (fp, h, to, resent_from, from); - address_delete (&from); + address_list_wipe(&from); return ret; } @@ -2292,12 +2288,10 @@ address_t *mutt_remove_duplicates (address_t * addr) } if (dup) { - debug_print (2, ("Removing %s\n", addr->mailbox)); - *last = addr->next; addr->next = NULL; - address_delete (&addr); + address_list_wipe(&addr); addr = *last; } @@ -2337,7 +2331,6 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, set_noconv_flags (hdr->content, 1); if (mx_open_mailbox (path, M_APPEND | M_QUIET, &f) == NULL) { - debug_print (1, ("unable to open mailbox %s in append-mode, aborting.\n", path)); return (-1); } @@ -2422,7 +2415,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, */ if (post && hdr->chain && hdr->chain) { - LIST *p; + string_list_t *p; fputs ("X-Mutt-Mix:", msg->fp); for (p = hdr->chain; p; p = p->next) @@ -2450,7 +2443,6 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, fflush (tempfp); if (ferror (tempfp)) { - debug_print (1, ("%s: write failed.\n", tempfile)); fclose (tempfp); unlink (tempfile); mx_commit_message (msg, &f); /* XXX - really? */