X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=e92b825374bd4c76ef484b2debd32933381f52dd;hp=63399e432957d9f6649c938ad7c008093553211e;hb=01bd0a7410e476abaebf03d820bcf31a5ec4c7c0;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23 diff --git a/sendlib.c b/sendlib.c index 63399e4..e92b825 100644 --- a/sendlib.c +++ b/sendlib.c @@ -76,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; @@ -247,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; @@ -263,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; @@ -274,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; @@ -285,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) { @@ -373,7 +374,7 @@ 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 */ @@ -598,7 +599,7 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, 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); @@ -611,7 +612,7 @@ static ssize_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] = -1; + cd[i] = MUTT_ICONV_ERROR, score[i] = -1; rewind (file); ibl = 0; @@ -625,7 +626,7 @@ static ssize_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 == -1 || !n || ICONV_NONTRANS); + assert (n == -1 || !n); if (n == -1 && ((errno != EINVAL && errno != E2BIG) || ib == bufi)) { assert (errno == EILSEQ || @@ -637,7 +638,7 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, /* Convert from UTF-8 */ for (i = 0; i < ncodes; i++) - if (cd[i] != (iconv_t) (-1) && score[i] != -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); @@ -651,7 +652,7 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, update_content_info (&infos[i], &states[i], bufo, ob - bufo); } } - else if (cd[i] == (iconv_t) (-1) && score[i] == -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); @@ -668,13 +669,13 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, /* Find best score */ ret = -1; for (i = 0; i < ncodes; i++) { - if (cd[i] == (iconv_t) (-1) && score[i] == -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] == -1) + else if (cd[i] == MUTT_ICONV_ERROR || score[i] == -1) continue; else if (ret == -1 || score[i] < ret) { *tocode = i; @@ -690,7 +691,7 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, } 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); @@ -826,7 +827,7 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b) convert_file_from_to (fp, fchs, chs ? chs : SendCharset, &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; @@ -846,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; @@ -1136,7 +1137,7 @@ char *mutt_get_body_charset (char *d, ssize_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"); @@ -1151,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)