diff options
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/broken-date-parser.c | 2 | ||||
| -rw-r--r-- | camel/camel-mime-filter-chomp.c | 4 | ||||
| -rw-r--r-- | camel/camel-mime-utils.c | 79 |
4 files changed, 66 insertions, 25 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 4de990397c..b7210ba8b5 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2002-03-19 Jeffrey Stedfast <fejj@ximian.com> + + * camel-mime-utils.c (header_encode_param): Fix this to work + right. We need to convert the input buffer to the charset we claim + in the encoded param (duh). + 2002-03-18 Jeffrey Stedfast <fejj@ximian.com> * providers/smtp/camel-smtp-transport.c diff --git a/camel/broken-date-parser.c b/camel/broken-date-parser.c index bc711a5092..00971fa9c7 100644 --- a/camel/broken-date-parser.c +++ b/camel/broken-date-parser.c @@ -401,7 +401,7 @@ decode_broken_date (struct _date_token *tokens, int *tzone) } d(printf ("\n")); - + time = mktime (&tm); #if defined(HAVE_TIMEZONE) time -= timezone; diff --git a/camel/camel-mime-filter-chomp.c b/camel/camel-mime-filter-chomp.c index 67a6e71ed7..6083b6dfe7 100644 --- a/camel/camel-mime-filter-chomp.c +++ b/camel/camel-mime-filter-chomp.c @@ -125,12 +125,12 @@ complete (CamelMimeFilter *f, char *in, size_t len, size_t prespace, /* in the case of a canonical eoln */ if (*inptr == '\r' && *(inptr + 1) == '\n') { - *outptr++ = *inptr++; + *outptr++ = (char) *inptr++; (*outlen)++; } if (*inptr == '\n') { - *outptr++ = *inptr++; + *outptr++ = (char) *inptr++; (*outlen)++; } diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c index bcd9806cd7..86a8021cba 100644 --- a/camel/camel-mime-utils.c +++ b/camel/camel-mime-utils.c @@ -1223,7 +1223,7 @@ header_decode_string (const char *in, const char *default_charset) static void rfc2047_encode_word(GString *outstring, const char *in, size_t len, const char *type, unsigned short safemask) { - iconv_t ic = (iconv_t *)-1; + iconv_t ic = (iconv_t) -1; char *buffer, *out, *ascii; size_t inlen, outlen, enclen, bufflen; const char *inptr, *p; @@ -1368,7 +1368,6 @@ header_encode_string (const unsigned char *in) inptr++; continue; } - if (g_unichar_isspace (c) && !last_was_space) { /* we've reached the end of a 'word' */ @@ -2898,8 +2897,11 @@ header_param_list_decode(const char *in) static char * header_encode_param (const unsigned char *in, gboolean *encoded) { - const unsigned char *inptr = in; - char *outstr, *charset; + register const unsigned char *inptr = in; + unsigned char *outbuf = NULL; + iconv_t cd = (iconv_t) -1; + const char *charset; + char *outstr; int encoding; GString *out; @@ -2918,12 +2920,11 @@ header_encode_param (const unsigned char *in, gboolean *encoded) if (*inptr == '\0') return g_strdup (in); - out = g_string_new (""); inptr = in; encoding = 0; while (inptr && *inptr) { - gunichar c; const char *newinptr; + gunichar c; newinptr = g_utf8_next_char (inptr); c = g_utf8_get_char (inptr); @@ -2934,34 +2935,68 @@ header_encode_param (const unsigned char *in, gboolean *encoded) continue; } - /* FIXME: make sure that '\'', '*', and ';' are also encoded */ - if (c > 127 && c < 256) { encoding = MAX (encoding, 1); - g_string_sprintfa (out, "%%%c%c", tohex[(c >> 4) & 0xf], tohex[c & 0xf]); } else if (c >= 256) { encoding = MAX (encoding, 2); + } + + inptr = newinptr; + } + + if (encoding == 2) + charset = camel_charset_best (in, inptr - in); + else + charset = "iso-8859-1"; + + if (strcasecmp (charset, "UTF-8") != 0) + cd = e_iconv_open (charset, "UTF-8"); + + if (cd == (iconv_t) -1) { + charset = "UTF-8"; + inptr = in; + } else { + size_t inleft, outleft; + const char *inbuf; + char *outptr; + + inleft = (inptr - in); + outleft = inleft * 6 + 16 + 1; + outptr = outbuf = alloca (outleft); + inbuf = in; + + if (e_iconv (cd, &inbuf, &inleft, &outptr, &outleft) == (size_t) -1) { + w(g_warning ("Conversion problem: conversion truncated: %s" g_strerror (errno))); + } else { + e_iconv (cd, NULL, 0, &outptr, &outleft); + } + + e_iconv_close (cd); + + *outptr = '\0'; + + inptr = outbuf; + } + + /* FIXME: set the 'language' as well, assuming we can get that info...? */ + out = g_string_new (""); + g_string_sprintfa (out, "%s''", charset); + + while (inptr && *inptr) { + unsigned char c = *inptr++; + + /* FIXME: make sure that '\'', '*', and ';' are also encoded */ + + if (c > 127) { g_string_sprintfa (out, "%%%c%c", tohex[(c >> 4) & 0xf], tohex[c & 0xf]); } else if (is_lwsp (c) || !(camel_mime_special_table[c] & IS_ESAFE)) { g_string_sprintfa (out, "%%%c%c", tohex[(c >> 4) & 0xf], tohex[c & 0xf]); } else { g_string_append_c (out, c); } - - inptr = newinptr; } - /* FIXME: set the 'language' as well, assuming we can get that info...? */ - switch (encoding) { - default: - g_string_prepend (out, "iso-8859-1''"); - break; - case 2: - charset = g_strdup_printf ("%s''", camel_charset_best (in, inptr - in)); - g_string_prepend (out, charset); - g_free (charset); - break; - } + g_free (outbuf); outstr = out->str; g_string_free (out, FALSE); |