/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "procmime.h"
#include "procheader.h"
#include "base64.h"
+#include "quoted-printable.h"
#include "uuencode.h"
#include "unmime.h"
#include "html.h"
# include "rfc2015.h"
#endif
-#include "prefs.h"
+#include "prefs_gtk.h"
static GHashTable *procmime_get_mime_type_table (void);
return mimeinfo;
}
-void procmime_mimeinfo_free(MimeInfo *mimeinfo)
-{
- if (!mimeinfo) return;
-
- g_free(mimeinfo->encoding);
- g_free(mimeinfo->content_type);
- g_free(mimeinfo->charset);
- g_free(mimeinfo->name);
- g_free(mimeinfo->boundary);
- g_free(mimeinfo->content_disposition);
- g_free(mimeinfo->filename);
-#if USE_GPGME
- g_free(mimeinfo->plaintextfile);
- g_free(mimeinfo->sigstatus);
- g_free(mimeinfo->sigstatus_full);
-#endif
-
- procmime_mimeinfo_free(mimeinfo->sub);
-
- g_free(mimeinfo);
-}
-
void procmime_mimeinfo_free_all(MimeInfo *mimeinfo)
{
while (mimeinfo != NULL) {
if (!sub) break;
sub->level = partinfo->level + 1;
- sub->parent = partinfo->parent;
+ sub->parent = partinfo;
sub->main = partinfo;
if (sub->level < 8) {
Xalloca(tmp, len, return);
conv_unmime_header(tmp, len, value, NULL);
g_free(mimeinfo->name);
- mimeinfo->name = g_strdup(tmp);
+ /*pgp signatures should NOT have a name */
+ if (mimeinfo->content_type
+ && strcasecmp(mimeinfo->content_type, "application/pgp-signature"))
+ mimeinfo->name = g_strdup(tmp);
} else if (!strcasecmp(attr, "boundary"))
mimeinfo->boundary = g_strdup(value);
}
Xalloca(tmp, len, return);
conv_unmime_header(tmp, len, value, NULL);
g_free(mimeinfo->filename);
- mimeinfo->filename = g_strdup(tmp);
+ /*pgp signatures should NOT have a name */
+ if (mimeinfo->content_type
+ && strcasecmp(mimeinfo->content_type, "application/pgp-signature"))
+ mimeinfo->filename = g_strdup(tmp);
break;
}
}
Xalloca(tmp, blen, return);
conv_unmime_header(tmp, blen, buf, NULL);
g_free(mimeinfo->name);
- mimeinfo->name = g_strdup(tmp);
+ mimeinfo->name = NULL;
+ /*pgp signatures should NOT have a name */
+ if (mimeinfo->content_type
+ && strcasecmp(mimeinfo->content_type, "application/pgp-signature"))
+ mimeinfo->name = g_strdup(tmp);
}
void procmime_scan_subject(MimeInfo *mimeinfo,
(!boundary ||
!IS_BOUNDARY(buf, boundary, boundary_len))) {
gint len;
- len = unmime_quoted_printable_line(buf);
+ len = qp_decode_line(buf);
fwrite(buf, len, 1, outfp);
}
} else if (mimeinfo->encoding_type == ENC_BASE64) {
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, RENDERER_RC, NULL);
if ((pfile = prefs_write_open(rcpath)) == NULL) {
- g_warning(_("failed to write configuration to file\n"));
+ g_warning("failed to write configuration to file\n");
g_free(rcpath);
return;
}
renderer->renderer);
}
- if (prefs_write_close(pfile) < 0) {
- g_warning(_("failed to write configuration to file\n"));
+ if (prefs_file_close(pfile) < 0) {
+ g_warning("failed to write configuration to file\n");
return;
}
}
}
if (conv_fail)
- g_warning(_("procmime_get_text_content(): Code conversion failed.\n"));
+ g_warning("procmime_get_text_content(): Code conversion failed.\n");
fclose(tmpfp);
rewind(outfp);
else if (!strncasecmp(charset, "ISO-2022-", 9) ||
!strcasecmp(charset, "US-ASCII"))
return ENC_7BIT;
+ else if (!strcasecmp(charset, "ISO-8859-5") ||
+ !strncasecmp(charset, "KOI8-", 5) ||
+ !strcasecmp(charset, "Windows-1251"))
+ return ENC_8BIT;
+ else if (!strncasecmp(charset, "ISO-8859-", 9))
+ return ENC_QUOTED_PRINTABLE;
else
return ENC_8BIT;
- /* return ENC_BASE64; */
- /* return ENC_QUOTED_PRINTABLE; */
}
EncodingType procmime_get_encoding_for_file(const gchar *file)
return ENC_7BIT;
}
-const gchar *procmime_get_encoding_str(EncodingType encoding)
+struct EncodingTable
{
- static const gchar *encoding_str[] = {
- "7bit", "8bit", "quoted-printable", "base64", "x-uuencode",
- NULL
- };
+ gchar *str;
+ EncodingType enc_type;
+};
- if (encoding >= ENC_7BIT && encoding <= ENC_UNKNOWN)
- return encoding_str[encoding];
- else
- return NULL;
+struct EncodingTable encoding_table[] = {
+ {"7bit", ENC_7BIT},
+ {"8bit", ENC_8BIT},
+ {"binary", ENC_BINARY},
+ {"quoted-printable", ENC_QUOTED_PRINTABLE},
+ {"base64", ENC_BASE64},
+ {"x-uuencode", ENC_UNKNOWN},
+ {NULL, ENC_UNKNOWN},
+};
+
+const gchar *procmime_get_encoding_str(EncodingType encoding)
+{
+ struct EncodingTable *enc_table;
+
+ for (enc_table = encoding_table; enc_table->str != NULL; enc_table++) {
+ if (enc_table->enc_type == encoding)
+ return enc_table->str;
+ }
+ return NULL;
}