/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto & The Claws Mail Team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto & The Claws Mail Team
*
* 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
+#define _GNU_SOURCE
+#include <stdio.h>
+
#include "defs.h"
-#include <stdio.h>
#include <glib.h>
#include <glib/gi18n.h>
-#include <stdio.h>
#include <string.h>
#if HAVE_LOCALE_H
# include <locale.h>
#include "procmime.h"
#include "procheader.h"
-#include "base64.h"
#include "quoted-printable.h"
#include "uuencode.h"
#include "unmime.h"
#include "prefs_gtk.h"
#include "alertpanel.h"
#include "timing.h"
+#include "privacy.h"
static GHashTable *procmime_get_mime_type_table (void);
static MimeInfo *procmime_scan_file_short(const gchar *filename);
MimeInfo *procmime_mimeinfo_parent(MimeInfo *mimeinfo)
{
- g_return_val_if_fail(mimeinfo != NULL, NULL);
- g_return_val_if_fail(mimeinfo->node != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo->node != NULL, NULL);
if (mimeinfo->node->parent == NULL)
return NULL;
MimeInfo *procmime_mimeinfo_next(MimeInfo *mimeinfo)
{
- g_return_val_if_fail(mimeinfo != NULL, NULL);
- g_return_val_if_fail(mimeinfo->node != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo->node != NULL, NULL);
if (mimeinfo->node->children)
return (MimeInfo *) mimeinfo->node->children->data;
{
gchar *filename;
MimeInfo *mimeinfo;
- START_TIMING("");
- filename = procmsg_get_message_file_path(msginfo);
+
+ filename = procmsg_get_message_file_path(msginfo);
if (!filename || !is_file_exist(filename)) {
g_free(filename);
return NULL;
mimeinfo = procmime_scan_queue_file(filename);
g_free(filename);
- END_TIMING();
return mimeinfo;
}
{
const gchar *value;
- g_return_val_if_fail(mimeinfo != NULL, NULL);
- g_return_val_if_fail(name != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(name != NULL, NULL);
value = g_hash_table_lookup(mimeinfo->dispositionparameters, name);
if (value == NULL)
return value;
}
+#ifdef HAVE_FGETS_UNLOCKED
+#define SC_FGETS fgets_unlocked
+#define SC_FPUTS fputs_unlocked
+#define SC_FPUTC fputc_unlocked
+#define SC_FREAD fread_unlocked
+#define SC_FWRITE fwrite_unlocked
+#define SC_FEOF feof_unlocked
+#define SC_FERROR ferror_unlocked
+
+static FILE *procmime_fopen(const gchar *file, const gchar *mode)
+{
+ FILE *fp = g_fopen(file, mode);
+ if (!fp)
+ return NULL;
+ flockfile(fp);
+ return fp;
+}
+static int procmime_fclose(FILE *fp)
+{
+ funlockfile(fp);
+ return fclose(fp);
+}
+#else
+#define SC_FGETS fgets
+#define SC_FPUTS fputs
+#define SC_FPUTC fputc
+#define SC_FREAD fread
+#define SC_FWRITE fwrite
+#define SC_FEOF feof
+#define SC_FERROR ferror
+#define procmime_fopen g_fopen
+#define procmime_fclose fclose
+#endif
+
#define FLUSH_LASTLINE() { \
if (*lastline != '\0') { \
gint llen = 0; \
/* this is flowed */ \
if (delsp) \
lastline[llen-1] = '\0'; \
- if (fputs(lastline, outfp) == EOF) \
+ if (SC_FPUTS(lastline, outfp) == EOF) \
err = TRUE; \
} else { \
- if (fputs(lastline, outfp) == EOF) \
+ if (SC_FPUTS(lastline, outfp) == EOF) \
err = TRUE; \
- if (fputs("\n", outfp) == EOF) \
+ if (SC_FPUTS("\n", outfp) == EOF) \
err = TRUE; \
} \
} \
gboolean flowed = FALSE;
gboolean delsp = FALSE;
gboolean err = FALSE;
+ gint state = 0;
+ guint save = 0;
EncodingType encoding = forced_encoding
? forced_encoding
: mimeinfo->encoding_type;
gchar lastline[BUFFSIZE];
memset(lastline, 0, BUFFSIZE);
-
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
if (prefs_common.respect_flowed_format &&
mimeinfo->type == MIMETYPE_TEXT &&
))
return TRUE;
- infp = g_fopen(mimeinfo->data.filename, "rb");
+ if (mimeinfo->type == MIMETYPE_MULTIPART || mimeinfo->type == MIMETYPE_MESSAGE)
+ return TRUE;
+
+ if (mimeinfo->data.filename == NULL)
+ return FALSE;
+
+ infp = procmime_fopen(mimeinfo->data.filename, "rb");
if (!infp) {
perror("fopen");
return FALSE;
}
- fseek(infp, mimeinfo->offset, SEEK_SET);
+ if (fseek(infp, mimeinfo->offset, SEEK_SET) < 0) {
+ perror("fseek");
+ procmime_fclose(infp);
+ return FALSE;
+ }
outfp = get_tmpfile_in_dir(get_mime_tmp_dir(), &tmpfilename);
if (!outfp) {
perror("tmpfile");
- fclose(infp);
+ procmime_fclose(infp);
return FALSE;
}
+#ifdef HAVE_FGETS_UNLOCKED
+ flockfile(outfp);
+#endif
tmp_file = TRUE;
readend = mimeinfo->offset + mimeinfo->length;
if (encoding == ENC_QUOTED_PRINTABLE) {
- while ((ftell(infp) < readend) && (fgets(buf, sizeof(buf), infp) != NULL)) {
+ while ((ftell(infp) < readend) && (SC_FGETS(buf, sizeof(buf), infp) != NULL)) {
gint len;
len = qp_decode_line(buf);
buf[len]='\0';
if (!flowed) {
- if (fwrite(buf, 1, len, outfp) < len)
+ if (SC_FWRITE(buf, 1, len, outfp) < len)
err = TRUE;
} else {
FLUSH_LASTLINE();
FLUSH_LASTLINE();
} else if (encoding == ENC_BASE64) {
gchar outbuf[BUFFSIZE];
- gint len;
- Base64Decoder *decoder;
+ gint len, inlen, inread;
gboolean got_error = FALSE;
gboolean uncanonicalize = FALSE;
- FILE *tmpfp = outfp;
+ FILE *tmpfp = NULL;
+ gboolean null_bytes = FALSE;
+ gboolean starting = TRUE;
if (mimeinfo->type == MIMETYPE_TEXT ||
mimeinfo->type == MIMETYPE_MESSAGE) {
tmpfp = my_tmpfile();
if (!tmpfp) {
perror("tmpfile");
- if (tmp_file) fclose(outfp);
- fclose(infp);
+ if (tmp_file)
+ procmime_fclose(outfp);
+ procmime_fclose(infp);
return FALSE;
}
- }
-
- decoder = base64_decoder_new();
- while ((ftell(infp) < readend) && (fgets(buf, sizeof(buf), infp) != NULL)) {
- len = base64_decoder_decode(decoder, buf, outbuf);
- if (len < 0 && !got_error) {
+#ifdef HAVE_FGETS_UNLOCKED
+ flockfile(tmpfp);
+#endif
+ } else
+ tmpfp = outfp;
+
+ while ((inlen = MIN(readend - ftell(infp), sizeof(buf))) > 0 && !err) {
+ inread = SC_FREAD(buf, 1, inlen, infp);
+ len = g_base64_decode_step(buf, inlen, outbuf, &state, &save);
+ if (uncanonicalize == TRUE && strlen(outbuf) < len && starting) {
+ uncanonicalize = FALSE;
+ null_bytes = TRUE;
+ }
+ starting = FALSE;
+ if (((inread != inlen) || len < 0) && !got_error) {
g_warning("Bad BASE64 content.\n");
- if (fwrite(_("[Error decoding BASE64]\n"),
+ if (SC_FWRITE(_("[Error decoding BASE64]\n"),
sizeof(gchar),
strlen(_("[Error decoding BASE64]\n")),
tmpfp) < strlen(_("[Error decoding BASE64]\n")))
} else if (len >= 0) {
/* print out the error message only once
* per block */
- if (fwrite(outbuf, sizeof(gchar), len, tmpfp) < len)
- err = TRUE;
+ if (null_bytes) {
+ /* we won't uncanonicalize, output to outfp directly */
+ if (SC_FWRITE(outbuf, sizeof(gchar), len, outfp) < len)
+ err = TRUE;
+ } else {
+ if (SC_FWRITE(outbuf, sizeof(gchar), len, tmpfp) < len)
+ err = TRUE;
+ }
got_error = FALSE;
}
}
- base64_decoder_free(decoder);
if (uncanonicalize) {
rewind(tmpfp);
- while (fgets(buf, sizeof(buf), tmpfp) != NULL) {
+ while (SC_FGETS(buf, sizeof(buf), tmpfp) != NULL) {
strcrchomp(buf);
- if (fputs(buf, outfp) == EOF)
+ if (SC_FPUTS(buf, outfp) == EOF)
err = TRUE;
}
- fclose(tmpfp);
+ procmime_fclose(tmpfp);
}
} else if (encoding == ENC_X_UUENCODE) {
gchar outbuf[BUFFSIZE];
gint len;
gboolean flag = FALSE;
- while ((ftell(infp) < readend) && (fgets(buf, sizeof(buf), infp) != NULL)) {
+ while ((ftell(infp) < readend) && (SC_FGETS(buf, sizeof(buf), infp) != NULL)) {
if (!flag && strncmp(buf,"begin ", 6)) continue;
if (flag) {
g_warning("Bad UUENCODE content(%d)\n", len);
break;
}
- if (fwrite(outbuf, sizeof(gchar), len, outfp) < len)
+ if (SC_FWRITE(outbuf, sizeof(gchar), len, outfp) < len)
err = TRUE;
} else
flag = TRUE;
}
} else {
- while ((ftell(infp) < readend) && (fgets(buf, sizeof(buf), infp) != NULL)) {
+ while ((ftell(infp) < readend) && (SC_FGETS(buf, sizeof(buf), infp) != NULL)) {
if (!flowed) {
- if (fputs(buf, outfp) == EOF)
+ if (SC_FPUTS(buf, outfp) == EOF)
err = TRUE;
} else {
FLUSH_LASTLINE();
g_warning("write error");
}
- fclose(outfp);
- fclose(infp);
+ procmime_fclose(outfp);
+ procmime_fclose(infp);
if (err == TRUE) {
return FALSE;
}
- g_stat(tmpfilename, &statbuf);
- if (mimeinfo->tmp && (mimeinfo->data.filename != NULL))
+ if (g_stat(tmpfilename, &statbuf) < 0) {
+ FILE_OP_ERROR(tmpfilename, "stat");
+ return FALSE;
+ }
+
+ if (mimeinfo->tmp)
claws_unlink(mimeinfo->data.filename);
g_free(mimeinfo->data.filename);
mimeinfo->data.filename = tmpfilename;
perror("tmpfile");
return FALSE;
}
+#ifdef HAVE_FGETS_UNLOCKED
+ flockfile(outfp);
+#endif
if (mimeinfo->content == MIMECONTENT_FILE && mimeinfo->data.filename) {
- if ((infp = g_fopen(mimeinfo->data.filename, "rb")) == NULL) {
+ if ((infp = procmime_fopen(mimeinfo->data.filename, "rb")) == NULL) {
g_warning("Can't open file %s\n", mimeinfo->data.filename);
- fclose(outfp);
+ procmime_fclose(outfp);
return FALSE;
}
} else if (mimeinfo->content == MIMECONTENT_MEM) {
infp = str_open_as_stream(mimeinfo->data.mem);
if (infp == NULL) {
- fclose(outfp);
+ procmime_fclose(outfp);
return FALSE;
}
+#ifdef HAVE_FGETS_UNLOCKED
+ flockfile(infp);
+#endif
+ } else {
+ procmime_fclose(outfp);
+ g_warning("Unknown mimeinfo");
+ return FALSE;
}
if (encoding == ENC_BASE64) {
- gchar inbuf[B64_LINE_SIZE], outbuf[B64_BUFFSIZE];
+ gchar inbuf[B64_LINE_SIZE], *out;
FILE *tmp_fp = infp;
gchar *tmp_file = NULL;
tmp_file = get_tmp_file();
if (canonicalize_file(mimeinfo->data.filename, tmp_file) < 0) {
g_free(tmp_file);
- fclose(infp);
- fclose(outfp);
+ procmime_fclose(infp);
+ procmime_fclose(outfp);
return FALSE;
}
- if ((tmp_fp = g_fopen(tmp_file, "rb")) == NULL) {
+ if ((tmp_fp = procmime_fopen(tmp_file, "rb")) == NULL) {
FILE_OP_ERROR(tmp_file, "fopen");
claws_unlink(tmp_file);
g_free(tmp_file);
- fclose(infp);
- fclose(outfp);
+ procmime_fclose(infp);
+ procmime_fclose(outfp);
return FALSE;
}
} else {
gchar *out = canonicalize_str(mimeinfo->data.mem);
- fclose(infp);
+ procmime_fclose(infp);
infp = str_open_as_stream(out);
tmp_fp = infp;
g_free(out);
if (infp == NULL) {
- fclose(outfp);
+ procmime_fclose(outfp);
return FALSE;
}
+#ifdef HAVE_FGETS_UNLOCKED
+ flockfile(infp);
+#endif
}
}
- while ((len = fread(inbuf, sizeof(gchar),
+ while ((len = SC_FREAD(inbuf, sizeof(gchar),
B64_LINE_SIZE, tmp_fp))
== B64_LINE_SIZE) {
- base64_encode(outbuf, inbuf, B64_LINE_SIZE);
- if (fputs(outbuf, outfp) == EOF)
+ out = g_base64_encode(inbuf, B64_LINE_SIZE);
+ if (SC_FPUTS(out, outfp) == EOF)
err = TRUE;
- if (fputc('\n', outfp) == EOF)
+ g_free(out);
+ if (SC_FPUTC('\n', outfp) == EOF)
err = TRUE;
}
- if (len > 0 && feof(tmp_fp)) {
- base64_encode(outbuf, inbuf, len);
- if (fputs(outbuf, outfp) == EOF)
+ if (len > 0 && SC_FEOF(tmp_fp)) {
+ out = g_base64_encode(inbuf, len);
+ if (SC_FPUTS(out, outfp) == EOF)
err = TRUE;
- if (fputc('\n', outfp) == EOF)
+ g_free(out);
+ if (SC_FPUTC('\n', outfp) == EOF)
err = TRUE;
}
if (tmp_file) {
- fclose(tmp_fp);
+ procmime_fclose(tmp_fp);
claws_unlink(tmp_file);
g_free(tmp_file);
}
} else if (encoding == ENC_QUOTED_PRINTABLE) {
gchar inbuf[BUFFSIZE], outbuf[BUFFSIZE * 4];
- while (fgets(inbuf, sizeof(inbuf), infp) != NULL) {
+ while (SC_FGETS(inbuf, sizeof(inbuf), infp) != NULL) {
qp_encode_line(outbuf, inbuf);
if (!strncmp("From ", outbuf, sizeof("From ")-1)) {
tmpbuf += sizeof("From ")-1;
- if (fputs("=46rom ", outfp) == EOF)
+ if (SC_FPUTS("=46rom ", outfp) == EOF)
err = TRUE;
- if (fputs(tmpbuf, outfp) == EOF)
+ if (SC_FPUTS(tmpbuf, outfp) == EOF)
err = TRUE;
} else {
- if (fputs(outbuf, outfp) == EOF)
+ if (SC_FPUTS(outbuf, outfp) == EOF)
err = TRUE;
}
}
} else {
gchar buf[BUFFSIZE];
- while (fgets(buf, sizeof(buf), infp) != NULL) {
+ while (SC_FGETS(buf, sizeof(buf), infp) != NULL) {
strcrchomp(buf);
- if (fputs(buf, outfp) == EOF)
+ if (SC_FPUTS(buf, outfp) == EOF)
err = TRUE;
}
}
- fclose(outfp);
- fclose(infp);
+ procmime_fclose(outfp);
+ procmime_fclose(infp);
if (err == TRUE)
return FALSE;
g_free(mimeinfo->data.mem);
}
- g_stat(tmpfilename, &statbuf);
+ if (g_stat(tmpfilename, &statbuf) < 0) {
+ FILE_OP_ERROR(tmpfilename, "stat");
+ return FALSE;
+ }
mimeinfo->content = MIMECONTENT_FILE;
mimeinfo->data.filename = tmpfilename;
mimeinfo->tmp = TRUE;
gint restlength, readlength;
gint saved_errno = 0;
- g_return_val_if_fail(outfile != NULL, -1);
- g_return_val_if_fail(mimeinfo != NULL, -1);
+ cm_return_val_if_fail(outfile != NULL, -1);
+ cm_return_val_if_fail(mimeinfo != NULL, -1);
if (mimeinfo->encoding_type != ENC_BINARY && !procmime_decode_content(mimeinfo))
return -EINVAL;
- if ((infp = g_fopen(mimeinfo->data.filename, "rb")) == NULL) {
+ if ((infp = procmime_fopen(mimeinfo->data.filename, "rb")) == NULL) {
saved_errno = errno;
FILE_OP_ERROR(mimeinfo->data.filename, "fopen");
return -(saved_errno);
if (fseek(infp, mimeinfo->offset, SEEK_SET) < 0) {
saved_errno = errno;
FILE_OP_ERROR(mimeinfo->data.filename, "fseek");
- fclose(infp);
+ procmime_fclose(infp);
return -(saved_errno);
}
- if ((outfp = g_fopen(outfile, "wb")) == NULL) {
+ if ((outfp = procmime_fopen(outfile, "wb")) == NULL) {
saved_errno = errno;
FILE_OP_ERROR(outfile, "fopen");
- fclose(infp);
+ procmime_fclose(infp);
return -(saved_errno);
}
restlength = mimeinfo->length;
- while ((restlength > 0) && ((readlength = fread(buf, 1, restlength > BUFFSIZE ? BUFFSIZE : restlength, infp)) > 0)) {
- if (fwrite(buf, 1, readlength, outfp) != readlength) {
+ while ((restlength > 0) && ((readlength = SC_FREAD(buf, 1, restlength > BUFFSIZE ? BUFFSIZE : restlength, infp)) > 0)) {
+ if (SC_FWRITE(buf, 1, readlength, outfp) != readlength) {
saved_errno = errno;
- fclose(outfp);
+ procmime_fclose(infp);
+ procmime_fclose(outfp);
return -(saved_errno);
}
restlength -= readlength;
}
- fclose(infp);
- if (fclose(outfp) == EOF) {
+ procmime_fclose(infp);
+ if (procmime_fclose(outfp) == EOF) {
saved_errno = errno;
FILE_OP_ERROR(outfile, "fclose");
claws_unlink(outfile);
return 0;
}
-static FILE *procmime_get_text_content(MimeInfo *mimeinfo)
+gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
+ gboolean (*scan_callback)(const gchar *str, gpointer cb_data),
+ gpointer cb_data)
{
- FILE *tmpfp, *outfp;
+ FILE *tmpfp;
const gchar *src_codeset;
gboolean conv_fail = FALSE;
gchar buf[BUFFSIZE];
gchar *str;
gchar *tmpfile;
- gboolean err = FALSE;
+ gboolean scan_ret = FALSE;
- g_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, TRUE);
+ cm_return_val_if_fail(scan_callback != NULL, TRUE);
if (!procmime_decode_content(mimeinfo))
- return NULL;
+ return TRUE;
tmpfile = procmime_get_tmp_file_name(mimeinfo);
if (tmpfile == NULL)
- return NULL;
+ return TRUE;
if (procmime_get_part(tmpfile, mimeinfo) < 0) {
g_free(tmpfile);
- return NULL;
+ return TRUE;
}
- tmpfp = g_fopen(tmpfile, "rb");
+ tmpfp = procmime_fopen(tmpfile, "rb");
if (tmpfp == NULL) {
g_free(tmpfile);
- return NULL;
- }
-
- if ((outfp = my_tmpfile()) == NULL) {
- perror("tmpfile");
- fclose(tmpfp);
- g_free(tmpfile);
- return NULL;
+ return TRUE;
}
src_codeset = forced_charset
? forced_charset :
procmime_mimeinfo_get_parameter(mimeinfo, "charset");
+ /* use supersets transparently when possible */
if (!forced_charset && src_codeset && !strcasecmp(src_codeset, CS_ISO_8859_1))
src_codeset = CS_WINDOWS_1252;
+ else if (!forced_charset && src_codeset && !strcasecmp(src_codeset, CS_X_GBK))
+ src_codeset = CS_GB18030;
+ else if (!forced_charset && src_codeset && !strcasecmp(src_codeset, CS_GBK))
+ src_codeset = CS_GB18030;
+ else if (!forced_charset && src_codeset && !strcasecmp(src_codeset, CS_GB2312))
+ src_codeset = CS_GB18030;
+ else if (!forced_charset && src_codeset && !strcasecmp(src_codeset, CS_X_VIET_VPS))
+ src_codeset = CS_WINDOWS_874;
if (mimeinfo->type == MIMETYPE_TEXT && !g_ascii_strcasecmp(mimeinfo->subtype, "html")) {
SC_HTMLParser *parser;
conv = conv_code_converter_new(src_codeset);
parser = sc_html_parser_new(tmpfp, conv);
while ((str = sc_html_parse(parser)) != NULL) {
- if (fputs(str, outfp) == EOF)
- err = TRUE;
+ if ((scan_ret = scan_callback(str, cb_data)) == TRUE)
+ break;
}
sc_html_parser_destroy(parser);
conv_code_converter_destroy(conv);
conv = conv_code_converter_new(src_codeset);
parser = ertf_parser_new(tmpfp, conv);
while ((str = ertf_parse(parser)) != NULL) {
- if (fputs(str, outfp) == EOF)
- err = TRUE;
+ if ((scan_ret = scan_callback(str, cb_data)) == TRUE)
+ break;
}
ertf_parser_destroy(parser);
conv_code_converter_destroy(conv);
} else if (mimeinfo->type == MIMETYPE_TEXT) {
- while (fgets(buf, sizeof(buf), tmpfp) != NULL) {
+ while (SC_FGETS(buf, sizeof(buf), tmpfp) != NULL) {
str = conv_codeset_strdup(buf, src_codeset, CS_UTF_8);
if (str) {
- if (fputs(str, outfp) == EOF)
- err = TRUE;
+ if ((scan_ret = scan_callback(str, cb_data)) == TRUE) {
+ g_free(str);
+ break;
+ }
g_free(str);
} else {
conv_fail = TRUE;
- if (fputs(buf, outfp) == EOF)
- err = TRUE;
+ if ((scan_ret = scan_callback(buf, cb_data)) == TRUE)
+ break;
}
}
}
if (conv_fail)
g_warning("procmime_get_text_content(): Code conversion failed.\n");
- fclose(tmpfp);
- rewind(outfp);
+ procmime_fclose(tmpfp);
claws_unlink(tmpfile);
g_free(tmpfile);
+ return scan_ret;
+}
+
+static gboolean scan_fputs_cb(const gchar *str, gpointer fp)
+{
+ if (SC_FPUTS(str, (FILE *)fp) == EOF)
+ return TRUE;
+
+ return FALSE;
+}
+
+FILE *procmime_get_text_content(MimeInfo *mimeinfo)
+{
+ FILE *outfp;
+ gboolean err;
+
+ if ((outfp = my_tmpfile()) == NULL) {
+ perror("tmpfile");
+ return NULL;
+ }
+#ifdef HAVE_FGETS_UNLOCKED
+ flockfile(outfp);
+#endif
+
+ err = procmime_scan_text_content(mimeinfo, scan_fputs_cb, outfp);
+
+ rewind(outfp);
if (err == TRUE) {
- fclose(outfp);
+ procmime_fclose(outfp);
+ return NULL;
+ }
+#ifdef HAVE_FGETS_UNLOCKED
+ funlockfile(outfp);
+#endif
+ return outfp;
+
+}
+
+FILE *procmime_get_binary_content(MimeInfo *mimeinfo)
+{
+ FILE *outfp;
+ gchar *tmpfile;
+
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
+
+ if (!procmime_decode_content(mimeinfo))
+ return NULL;
+
+ tmpfile = procmime_get_tmp_file_name(mimeinfo);
+ if (tmpfile == NULL)
+ return NULL;
+
+ if (procmime_get_part(tmpfile, mimeinfo) < 0) {
+ g_free(tmpfile);
+ return NULL;
+ }
+
+ outfp = procmime_fopen(tmpfile, "rb");
+ if (outfp == NULL) {
+ g_unlink(tmpfile);
+ g_free(tmpfile);
return NULL;
}
+ g_unlink(tmpfile);
+ g_free(tmpfile);
+
+#ifdef HAVE_FGETS_UNLOCKED
+ funlockfile(outfp);
+#endif
return outfp;
}
FILE *outfp = NULL;
MimeInfo *mimeinfo, *partinfo;
gboolean empty_ok = FALSE, short_scan = TRUE;
- START_TIMING("");
- g_return_val_if_fail(msginfo != NULL, NULL);
+
+ cm_return_val_if_fail(msginfo != NULL, NULL);
/* first we try to short-scan (for speed), refusing empty parts */
scan_again:
goto scan_again;
}
procmime_mimeinfo_free_all(mimeinfo);
- END_TIMING();
+
+ /* outfp already unlocked at this time */
return outfp;
}
FILE *outfp = NULL;
MimeInfo *mimeinfo, *partinfo, *encinfo;
- g_return_val_if_fail(msginfo != NULL, NULL);
+ cm_return_val_if_fail(msginfo != NULL, NULL);
mimeinfo = procmime_scan_message(msginfo);
if (!mimeinfo) {
procmime_mimeinfo_free_all(mimeinfo);
+ /* outfp already unlocked at this time */
return outfp;
}
MimeInfo *mimeinfo, *partinfo;
gboolean result = FALSE;
- g_return_val_if_fail(msginfo != NULL, FALSE);
+ cm_return_val_if_fail(msginfo != NULL, FALSE);
mimeinfo = procmime_scan_message(msginfo);
if (!mimeinfo) {
return result;
}
-static gboolean procmime_find_string_part(MimeInfo *mimeinfo, const gchar *filename,
- const gchar *str, StrFindFunc find_func)
-{
- FILE *outfp;
- gchar buf[BUFFSIZE];
-
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
- g_return_val_if_fail(mimeinfo->type == MIMETYPE_TEXT, FALSE);
- g_return_val_if_fail(str != NULL, FALSE);
- g_return_val_if_fail(find_func != NULL, FALSE);
-
- outfp = procmime_get_text_content(mimeinfo);
-
- if (!outfp)
- return FALSE;
-
- while (fgets(buf, sizeof(buf), outfp) != NULL) {
- strretchomp(buf);
- if (find_func(buf, str)) {
- fclose(outfp);
- return TRUE;
- }
- }
-
- fclose(outfp);
-
- return FALSE;
-}
-
-gboolean procmime_find_string(MsgInfo *msginfo, const gchar *str,
- StrFindFunc find_func)
-{
- MimeInfo *mimeinfo;
- MimeInfo *partinfo;
- gchar *filename;
- gboolean found = FALSE;
-
- g_return_val_if_fail(msginfo != NULL, FALSE);
- g_return_val_if_fail(str != NULL, FALSE);
- g_return_val_if_fail(find_func != NULL, FALSE);
-
- filename = procmsg_get_message_file(msginfo);
- if (!filename) return FALSE;
- mimeinfo = procmime_scan_message(msginfo);
-
- for (partinfo = mimeinfo; partinfo != NULL;
- partinfo = procmime_mimeinfo_next(partinfo)) {
- if (partinfo->type == MIMETYPE_TEXT) {
- if (procmime_find_string_part
- (partinfo, filename, str, find_func) == TRUE) {
- found = TRUE;
- break;
- }
- }
- }
-
- procmime_mimeinfo_free_all(mimeinfo);
- g_free(filename);
-
- return found;
-}
-
gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
{
static guint32 id = 0;
gchar *filename;
gchar f_prefix[10];
- g_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
g_snprintf(f_prefix, sizeof(f_prefix), "%08x.", id++);
exts = g_strsplit(mime_type->extension, " ", 16);
for (i = 0; exts[i] != NULL; i++) {
- /* use previously dup'd key on overwriting */
- if (g_hash_table_lookup(table, exts[i]))
- key = exts[i];
- else
+ /* Don't overwrite previously inserted extension */
+ if (!g_hash_table_lookup(table, exts[i])) {
key = g_strdup(exts[i]);
- g_hash_table_insert(table, key, mime_type);
+ g_hash_table_insert(table, key, mime_type);
+ }
}
g_strfreev(exts);
}
return mime_type_list;
#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
- if ((fp = g_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL)
+ if ((fp = procmime_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL)
#else
- if ((fp = g_fopen("/usr/share/mime/globs", "rb")) == NULL)
+ if ((fp = procmime_fopen("/usr/share/mime/globs", "rb")) == NULL)
#endif
{
fp_is_glob_file = FALSE;
- if ((fp = g_fopen("/etc/mime.types", "rb")) == NULL) {
- if ((fp = g_fopen(SYSCONFDIR "/mime.types", "rb"))
+ if ((fp = procmime_fopen("/etc/mime.types", "rb")) == NULL) {
+ if ((fp = procmime_fopen(SYSCONFDIR "/mime.types", "rb"))
== NULL) {
FILE_OP_ERROR(SYSCONFDIR "/mime.types",
"fopen");
}
}
- while (fgets(buf, sizeof(buf), fp) != NULL) {
+ while (SC_FGETS(buf, sizeof(buf), fp) != NULL) {
p = strchr(buf, '#');
if (p) *p = '\0';
g_strstrip(buf);
list = g_list_append(list, mime_type);
}
- fclose(fp);
+ procmime_fclose(fp);
if (!list)
g_warning("Can't read mime.types\n");
gfloat octet_percentage;
gboolean force_b64 = FALSE;
- if ((fp = g_fopen(file, "rb")) == NULL) {
+ if ((fp = procmime_fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return ENC_UNKNOWN;
}
- while ((len = fread(buf, sizeof(guchar), sizeof(buf), fp)) > 0) {
+ while ((len = SC_FREAD(buf, sizeof(guchar), sizeof(buf), fp)) > 0) {
guchar *p;
gint i;
total_len += len;
}
- fclose(fp);
+ procmime_fclose(fp);
if (total_len > 0)
octet_percentage = (gfloat)octet_chars / (gfloat)total_len;
procmime_decode_content(mimeinfo);
- fp = g_fopen(mimeinfo->data.filename, "rb");
+ fp = procmime_fopen(mimeinfo->data.filename, "rb");
if (fp == NULL) {
FILE_OP_ERROR(mimeinfo->data.filename, "fopen");
return;
}
- fseek(fp, mimeinfo->offset, SEEK_SET);
+ if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0) {
+ FILE_OP_ERROR(mimeinfo->data.filename, "fseek");
+ procmime_fclose(fp);
+ return;
+ }
procheader_get_header_fields(fp, hentry);
if (hentry[0].body != NULL) {
- tmp = conv_unmime_header(hentry[0].body, NULL);
+ tmp = conv_unmime_header(hentry[0].body, NULL, FALSE);
g_free(hentry[0].body);
hentry[0].body = tmp;
}
if (hentry[2].body != NULL) {
- tmp = conv_unmime_header(hentry[2].body, NULL);
+ tmp = conv_unmime_header(hentry[2].body, NULL, FALSE);
g_free(hentry[2].body);
hentry[2].body = tmp;
}
if (hentry[4].body != NULL) {
- tmp = conv_unmime_header(hentry[4].body, NULL);
+ tmp = conv_unmime_header(hentry[4].body, NULL, FALSE);
g_free(hentry[4].body);
hentry[4].body = tmp;
}
if (hentry[5].body != NULL) {
- tmp = conv_unmime_header(hentry[5].body, NULL);
+ tmp = conv_unmime_header(hentry[5].body, NULL, FALSE);
g_free(hentry[5].body);
hentry[5].body = tmp;
}
if (hentry[7].body != NULL) {
- tmp = conv_unmime_header(hentry[7].body, NULL);
+ tmp = conv_unmime_header(hentry[7].body, NULL, FALSE);
g_free(hentry[7].body);
hentry[7].body = tmp;
}
if (hentry[8].body != NULL) {
- tmp = conv_unmime_header(hentry[8].body, NULL);
+ tmp = conv_unmime_header(hentry[8].body, NULL, FALSE);
g_free(hentry[8].body);
hentry[8].body = tmp;
}
content_start = ftell(fp);
- fclose(fp);
+ procmime_fclose(fp);
len = mimeinfo->length - (content_start - mimeinfo->offset);
if (len < 0)
procmime_decode_content(mimeinfo);
debug_print("parse disposition notification\n");
- fp = g_fopen(mimeinfo->data.filename, "rb");
+ fp = procmime_fopen(mimeinfo->data.filename, "rb");
if (fp == NULL) {
FILE_OP_ERROR(mimeinfo->data.filename, "fopen");
return;
}
- fseek(fp, mimeinfo->offset, SEEK_SET);
+ if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0) {
+ FILE_OP_ERROR(mimeinfo->data.filename, "fseek");
+ procmime_fclose(fp);
+ return;
+ }
if (original_msgid && disposition_notification_hdr) {
hentry[0].body = g_strdup(original_msgid);
} else {
procheader_get_header_fields(fp, hentry);
}
+
+ procmime_fclose(fp);
- if (!hentry[0].body || !hentry[1].body) {
+ if (!hentry[0].body || !hentry[1].body) {
debug_print("MsgId %s, Disp %s\n",
hentry[0].body ? hentry[0].body:"(nil)",
hentry[1].body ? hentry[1].body:"(nil)");
#define GET_HEADERS() { \
procheader_get_header_fields(fp, hentry); \
if (hentry[0].body != NULL) { \
- tmp = conv_unmime_header(hentry[0].body, NULL); \
+ tmp = conv_unmime_header(hentry[0].body, NULL, FALSE); \
g_free(hentry[0].body); \
hentry[0].body = tmp; \
} \
if (hentry[2].body != NULL) { \
- tmp = conv_unmime_header(hentry[2].body, NULL); \
+ tmp = conv_unmime_header(hentry[2].body, NULL, FALSE); \
g_free(hentry[2].body); \
hentry[2].body = tmp; \
} \
if (hentry[4].body != NULL) { \
- tmp = conv_unmime_header(hentry[4].body, NULL); \
+ tmp = conv_unmime_header(hentry[4].body, NULL, FALSE); \
g_free(hentry[4].body); \
hentry[4].body = tmp; \
} \
if (hentry[5].body != NULL) { \
- tmp = conv_unmime_header(hentry[5].body, NULL); \
+ tmp = conv_unmime_header(hentry[5].body, NULL, FALSE); \
g_free(hentry[5].body); \
hentry[5].body = tmp; \
} \
if (hentry[6].body != NULL) { \
- tmp = conv_unmime_header(hentry[6].body, NULL); \
+ tmp = conv_unmime_header(hentry[6].body, NULL, FALSE); \
g_free(hentry[6].body); \
hentry[6].body = tmp; \
} \
if (hentry[7].body != NULL) { \
- tmp = conv_unmime_header(hentry[7].body, NULL); \
+ tmp = conv_unmime_header(hentry[7].body, NULL, FALSE); \
g_free(hentry[7].body); \
hentry[7].body = tmp; \
} \
{"Disposition:",
NULL, TRUE},
{NULL, NULL, FALSE}};
- gchar *p, *tmp;
+ gchar *tmp;
gchar *boundary;
gint boundary_len = 0, lastoffset = -1, i;
gchar buf[BUFFSIZE];
FILE *fp;
int result = 0;
- gboolean done = FALSE;
+ gboolean start_found = FALSE;
+ gboolean end_found = FALSE;
boundary = g_hash_table_lookup(mimeinfo->typeparameters, "boundary");
if (!boundary)
procmime_decode_content(mimeinfo);
- fp = g_fopen(mimeinfo->data.filename, "rb");
+ fp = procmime_fopen(mimeinfo->data.filename, "rb");
if (fp == NULL) {
FILE_OP_ERROR(mimeinfo->data.filename, "fopen");
return;
}
- fseek(fp, mimeinfo->offset, SEEK_SET);
- while ((p = fgets(buf, sizeof(buf), fp)) != NULL && result == 0) {
+
+ if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0) {
+ FILE_OP_ERROR(mimeinfo->data.filename, "fseek");
+ procmime_fclose(fp);
+ return;
+ }
+
+ while (SC_FGETS(buf, sizeof(buf), fp) != NULL && result == 0) {
if (ftell(fp) - 1 > (mimeinfo->offset + mimeinfo->length))
break;
if (IS_BOUNDARY(buf, boundary, boundary_len)) {
+ start_found = TRUE;
+
if (lastoffset != -1) {
gint len = (ftell(fp) - strlen(buf)) - lastoffset - 1;
if (len < 0)
hentry[6].body, hentry[7].body,
mimeinfo->data.filename, lastoffset,
len, short_scan);
- if (result == 1 && short_scan) {
- done = TRUE;
+ if (result == 1 && short_scan)
break;
- }
+
}
if (buf[2 + boundary_len] == '-' &&
buf[2 + boundary_len + 1] == '-') {
+ end_found = TRUE;
break;
}
for (i = 0; i < (sizeof hentry / sizeof hentry[0]) ; i++) {
lastoffset = ftell(fp);
}
}
+
+ if (start_found && !end_found && lastoffset != -1) {
+ gint len = (ftell(fp) - strlen(buf)) - lastoffset - 1;
+
+ if (len >= 0) {
+ result = procmime_parse_mimepart(mimeinfo,
+ hentry[0].body, hentry[1].body,
+ hentry[2].body, hentry[3].body,
+ hentry[4].body, hentry[5].body,
+ hentry[6].body, hentry[7].body,
+ mimeinfo->data.filename, lastoffset,
+ len, short_scan);
+ }
+ mimeinfo->broken = TRUE;
+ }
+
for (i = 0; i < (sizeof hentry / sizeof hentry[0]); i++) {
g_free(hentry[i].body);
hentry[i].body = NULL;
}
- fclose(fp);
+ procmime_fclose(fp);
}
static void parse_parameters(const gchar *parameters, GHashTable *table)
value[0] = '\0';
value++;
- while (value[0] == ' ')
+ while (value[0] != '\0' && value[0] == ' ')
value++;
down_attr = g_utf8_strdown(attribute, -1);
dstpos++;
}
*dstpos = '\0';
+ if (value[0] == '"')
+ extract_quote(value, '"');
} else {
if (value[0] == '"')
extract_quote(value, '"');
while (down_attr[strlen(down_attr)-1] == ' ')
down_attr[strlen(down_attr)-1] = '\0';
}
- if (value) {
- while (value[0] == ' ')
- value++;
- while (value[strlen(value)-1] == ' ')
- value[strlen(value)-1] = '\0';
- }
+
+ while (value[0] != '\0' && value[0] == ' ')
+ value++;
+ while (value[strlen(value)-1] == ' ')
+ value[strlen(value)-1] = '\0';
+
if (down_attr && strrchr(down_attr, '*') != NULL) {
gchar *tmpattr;
tmp[0] = '\0';
if ((tmp[1] == '0') && (tmp[2] == '\0') &&
- (g_slist_find_custom(concatlist, down_attr, g_str_equal) == NULL))
+ (g_slist_find_custom(concatlist, down_attr, (GCompareFunc)g_strcmp0) == NULL))
concatlist = g_slist_prepend(concatlist, g_strdup(tmpattr));
- if (convert && (g_slist_find_custom(convlist, down_attr, g_str_equal) == NULL))
+ if (convert && (g_slist_find_custom(convlist, tmpattr, (GCompareFunc)g_strcmp0) == NULL))
convlist = g_slist_prepend(convlist, g_strdup(tmpattr));
g_free(tmpattr);
} else if (convert) {
- if (g_slist_find_custom(convlist, down_attr, g_str_equal) == NULL)
+ if (g_slist_find_custom(convlist, down_attr, (GCompareFunc)g_strcmp0) == NULL)
convlist = g_slist_prepend(convlist, g_strdup(down_attr));
}
g_hash_table_insert(table, g_strdup(attribute), g_strdup(value->str));
g_string_free(value, TRUE);
}
- slist_free_strings(concatlist);
- g_slist_free(concatlist);
+ slist_free_strings_full(concatlist);
for (cur = convlist; cur != NULL; cur = g_slist_next(cur)) {
gchar *attribute, *key, *value;
continue;
charset = value;
+ if (charset == NULL)
+ continue;
lang = strchr(charset, '\'');
if (lang == NULL)
continue;
g_hash_table_insert(table, g_strdup(attribute), newvalue);
}
- slist_free_strings(convlist);
- g_slist_free(convlist);
+ slist_free_strings_full(convlist);
g_free(params);
}
static void procmime_parse_content_type(const gchar *content_type, MimeInfo *mimeinfo)
{
- g_return_if_fail(content_type != NULL);
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(content_type != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
/* RFC 2045, page 13 says that the mime subtype is MANDATORY;
* if it's not available we use the default Content-Type */
{
gchar *tmp, *params;
- g_return_if_fail(content_disposition != NULL);
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(content_disposition != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
tmp = g_strdup(content_disposition);
if ((params = strchr(tmp, ';')) != NULL) {
static gboolean procmime_mimeparser_parse(MimeParser *parser, MimeInfo *mimeinfo)
{
- g_return_val_if_fail(parser->parse != NULL, FALSE);
+ cm_return_val_if_fail(parser->parse != NULL, FALSE);
return parser->parse(parser, mimeinfo);
}
/* Create MimeInfo */
mimeinfo = procmime_mimeinfo_new();
mimeinfo->content = MIMECONTENT_FILE;
+
if (parent != NULL) {
if (g_node_depth(parent->node) > 32) {
/* 32 is an arbitrary value
mimeinfo->length = length;
if (content_type != NULL) {
+ g_strchomp(content_type);
procmime_parse_content_type(content_type, mimeinfo);
} else {
mimeinfo->type = MIMETYPE_TEXT;
}
if (content_encoding != NULL) {
+ g_strchomp(content_encoding);
procmime_parse_content_encoding(content_encoding, mimeinfo);
} else {
mimeinfo->encoding_type = ENC_UNKNOWN;
else
mimeinfo->location = NULL;
- if (content_disposition != NULL)
+ if (content_disposition != NULL) {
+ g_strchomp(content_disposition);
procmime_parse_content_disposition(content_disposition, mimeinfo);
- else
+ } else
mimeinfo->disposition = DISPOSITIONTYPE_UNKNOWN;
/* Call parser for mime type */
MimeInfo *mimeinfo;
struct stat buf;
- g_stat(filename, &buf);
+ if (g_stat(filename, &buf) < 0) {
+ FILE_OP_ERROR(filename, "stat");
+ return NULL;
+ }
mimeinfo = procmime_mimeinfo_new();
mimeinfo->content = MIMECONTENT_FILE;
{
MimeInfo *mimeinfo;
- g_return_val_if_fail(filename != NULL, NULL);
+ cm_return_val_if_fail(filename != NULL, NULL);
mimeinfo = procmime_scan_file_with_offset(filename, 0, short_scan);
gchar buf[BUFFSIZE];
gint offset = 0;
- g_return_val_if_fail(filename != NULL, NULL);
+ cm_return_val_if_fail(filename != NULL, NULL);
/* Open file */
- if ((fp = g_fopen(filename, "rb")) == NULL)
+ if ((fp = procmime_fopen(filename, "rb")) == NULL)
return NULL;
/* Skip queue header */
- while (fgets(buf, sizeof(buf), fp) != NULL) {
+ while (SC_FGETS(buf, sizeof(buf), fp) != NULL) {
/* new way */
if ((!strncmp(buf, "X-Claws-End-Special-Headers: 1",
strlen("X-Claws-End-Special-Headers:"))) ||
}
}
offset = ftell(fp);
- fclose(fp);
+ procmime_fclose(fp);
mimeinfo = procmime_scan_file_with_offset(filename, offset, short_scan);
g_string_append_printf(buf, "%%%s", hexstr);
}
}
- break;
+ break;
+#else
+ case ENC_AS_EXTENDED:
+ debug_print("Unhandled ENC_AS_EXTENDED.");
+ break;
#endif
case ENC_AS_ENCWORD:
len = MAX(strlen(val)*6, 512);
/* write header */
switch (mimeinfo->content) {
case MIMECONTENT_FILE:
- if ((infp = g_fopen(mimeinfo->data.filename, "rb")) == NULL) {
+ if ((infp = procmime_fopen(mimeinfo->data.filename, "rb")) == NULL) {
FILE_OP_ERROR(mimeinfo->data.filename, "fopen");
return -1;
}
- fseek(infp, mimeinfo->offset, SEEK_SET);
- while (fgets(buf, sizeof(buf), infp) == buf) {
+ if (fseek(infp, mimeinfo->offset, SEEK_SET) < 0) {
+ FILE_OP_ERROR(mimeinfo->data.filename, "fseek");
+ procmime_fclose(infp);
+ return -1;
+ }
+ while (SC_FGETS(buf, sizeof(buf), infp) == buf) {
strcrchomp(buf);
if (buf[0] == '\n' && buf[1] == '\0')
break;
if (skip && (buf[0] == ' ' || buf[0] == '\t'))
continue;
- if (g_ascii_strncasecmp(buf, "Mime-Version:", 13) == 0 ||
+ if (g_ascii_strncasecmp(buf, "MIME-Version:", 13) == 0 ||
g_ascii_strncasecmp(buf, "Content-Type:", 13) == 0 ||
g_ascii_strncasecmp(buf, "Content-Transfer-Encoding:", 26) == 0 ||
g_ascii_strncasecmp(buf, "Content-Description:", 20) == 0 ||
continue;
}
len = strlen(buf);
- if (fwrite(buf, sizeof(gchar), len, fp) < len) {
+ if (SC_FWRITE(buf, sizeof(gchar), len, fp) < len) {
g_warning("failed to dump %zd bytes from file", len);
- fclose(infp);
+ procmime_fclose(infp);
return -1;
}
skip = FALSE;
}
- fclose(infp);
+ procmime_fclose(infp);
break;
case MIMECONTENT_MEM:
len = strlen(mimeinfo->data.mem);
- if (fwrite(mimeinfo->data.mem, sizeof(gchar), len, fp) < len) {
+ if (SC_FWRITE(mimeinfo->data.mem, sizeof(gchar), len, fp) < len) {
g_warning("failed to dump %zd bytes from mem", len);
return -1;
}
return -1;
child = (MimeInfo *) childnode->data;
- if (fprintf(fp, "Mime-Version: 1.0\n") < 0) {
+ if (fprintf(fp, "MIME-Version: 1.0\n") < 0) {
g_warning("failed to write mime version");
return -1;
}
switch (mimeinfo->content) {
case MIMECONTENT_FILE:
- if ((infp = g_fopen(mimeinfo->data.filename, "rb")) == NULL) {
+ if ((infp = procmime_fopen(mimeinfo->data.filename, "rb")) == NULL) {
FILE_OP_ERROR(mimeinfo->data.filename, "fopen");
return -1;
}
- fseek(infp, mimeinfo->offset, SEEK_SET);
- while (fgets(buf, sizeof(buf), infp) == buf) {
+ if (fseek(infp, mimeinfo->offset, SEEK_SET) < 0) {
+ FILE_OP_ERROR(mimeinfo->data.filename, "fseek");
+ procmime_fclose(infp);
+ return -1;
+ }
+ while (SC_FGETS(buf, sizeof(buf), infp) == buf) {
if (IS_BOUNDARY(buf, boundary, strlen(boundary)))
break;
len = strlen(buf);
- if (fwrite(buf, sizeof(gchar), len, fp) < len) {
+ if (SC_FWRITE(buf, sizeof(gchar), len, fp) < len) {
g_warning("failed to write %zd", len);
- fclose(infp);
+ procmime_fclose(infp);
return -1;
}
}
- fclose(infp);
+ procmime_fclose(infp);
break;
case MIMECONTENT_MEM:
(*(str2 - 1) == '-') && (*(str2 - 2) == '-'))
*(str2 - 2) = '\0';
len = strlen(str);
- if (fwrite(str, sizeof(gchar), len, fp) < len) {
+ if (SC_FWRITE(str, sizeof(gchar), len, fp) < len) {
g_warning("failed to write %zd from mem", len);
g_free(str);
return -1;
if (G_NODE_IS_LEAF(mimeinfo->node)) {
switch (mimeinfo->content) {
case MIMECONTENT_FILE:
- if ((infp = g_fopen(mimeinfo->data.filename, "rb")) == NULL) {
+ if ((infp = procmime_fopen(mimeinfo->data.filename, "rb")) == NULL) {
FILE_OP_ERROR(mimeinfo->data.filename, "fopen");
return -1;
}
copy_file_part_to_fp(infp, mimeinfo->offset, mimeinfo->length, fp);
- fclose(infp);
+ procmime_fclose(infp);
return 0;
case MIMECONTENT_MEM:
len = strlen(mimeinfo->data.mem);
- if (fwrite(mimeinfo->data.mem, sizeof(gchar), len, fp) < len)
+ if (SC_FWRITE(mimeinfo->data.mem, sizeof(gchar), len, fp) < len)
return -1;
return 0;
projects / claws.git / blobdiff