int use_inbody_headers;
const char *metainfo_charset;
+ struct strbuf charset;
char *message_id;
enum {
TE_DONTCARE, TE_QP, TE_BASE64
int header_stage; /* still checking in-body headers? */
};
-
-static struct strbuf charset = STRBUF_INIT;
static struct strbuf **p_hdr_data, **s_hdr_data;
#define MAX_BOUNDARIES 5
static struct strbuf **content_top = content;
-static void handle_content_type(struct strbuf *line)
+static void handle_content_type(struct mailinfo *mi, struct strbuf *line)
{
struct strbuf *boundary = xmalloc(sizeof(struct strbuf));
strbuf_init(boundary, line->len);
*content_top = boundary;
boundary = NULL;
}
- slurp_attr(line->buf, "charset=", &charset);
+ slurp_attr(line->buf, "charset=", &mi->charset);
if (boundary) {
strbuf_release(boundary);
strbuf_add(&sb, line->buf + len, line->len - len);
decode_header(mi, &sb);
strbuf_insert(&sb, 0, "Content-Type: ", len);
- handle_content_type(&sb);
+ handle_content_type(mi, &sb);
ret = 1;
goto check_header_out;
}
mi->header_stage = 0;
/* normalize the log message to UTF-8. */
- convert_to_utf8(mi, line, charset.buf);
+ convert_to_utf8(mi, line, mi->charset.buf);
if (mi->use_scissors && is_scissors_line(line)) {
int i;
/* set some defaults */
mi->transfer_encoding = TE_DONTCARE;
- strbuf_reset(&charset);
+ strbuf_reset(&mi->charset);
/* slurp in this section's info */
while (read_one_header_line(line, mi->input))
memset(mi, 0, sizeof(*mi));
strbuf_init(&mi->name, 0);
strbuf_init(&mi->email, 0);
+ strbuf_init(&mi->charset, 0);
mi->header_stage = 1;
mi->use_inbody_headers = 1;
git_config(git_mailinfo_config, &mi);
{
strbuf_release(&mi->name);
strbuf_release(&mi->email);
+ strbuf_release(&mi->charset);
free(mi->message_id);
}