kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

format-patch: simplify after-subject MIME header handling 

In log_write_email_headers(), we append our MIME headers to the set of
extra headers by creating a new strbuf, adding the existing headers, and
then adding our new ones.  We had to do it this way when our output
buffer might point to the constant opt->extra_headers variable.

But since the previous commit, we always make a local copy of that
variable. Let's turn that into a strbuf, which lets the MIME code simply
append to it. That simplifies the function and avoids a pointless extra
copy of the headers.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2024-03-19 20:35:57 -04:00 committed by Junio C Hamano
parent 305a68143c
commit 838ba014ce
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
log-tree.c
View File

@ -474,12 +474,15 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit,
int *need_8bit_cte_p, int *need_8bit_cte_p,
int maybe_multipart) int maybe_multipart)
{ {
char *extra_headers = xstrdup_or_null(opt->extra_headers); struct strbuf headers = STRBUF_INIT;
const char *name = oid_to_hex(opt->zero_commit ? const char *name = oid_to_hex(opt->zero_commit ?
null_oid() : &commit->object.oid); null_oid() : &commit->object.oid);


*need_8bit_cte_p = 0; /* unknown */ *need_8bit_cte_p = 0; /* unknown */


if (opt->extra_headers)
strbuf_addstr(&headers, opt->extra_headers);

fprintf(opt->diffopt.file, "From %s Mon Sep 17 00:00:00 2001\n", name); fprintf(opt->diffopt.file, "From %s Mon Sep 17 00:00:00 2001\n", name);
graph_show_oneline(opt->graph); graph_show_oneline(opt->graph);
if (opt->message_id) { if (opt->message_id) {
@ -496,15 +499,13 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit,
graph_show_oneline(opt->graph); graph_show_oneline(opt->graph);
} }
if (opt->mime_boundary && maybe_multipart) { if (opt->mime_boundary && maybe_multipart) {
struct strbuf subject_buffer = STRBUF_INIT;
static struct strbuf buffer = STRBUF_INIT; static struct strbuf buffer = STRBUF_INIT;
struct strbuf filename = STRBUF_INIT; struct strbuf filename = STRBUF_INIT;
*need_8bit_cte_p = -1; /* NEVER */ *need_8bit_cte_p = -1; /* NEVER */


strbuf_reset(&buffer); strbuf_reset(&buffer);


strbuf_addf(&subject_buffer, strbuf_addf(&headers,
"%s"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: multipart/mixed;" "Content-Type: multipart/mixed;"
" boundary=\"%s%s\"\n" " boundary=\"%s%s\"\n"
@ -515,11 +516,8 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit,
"Content-Type: text/plain; " "Content-Type: text/plain; "
"charset=UTF-8; format=fixed\n" "charset=UTF-8; format=fixed\n"
"Content-Transfer-Encoding: 8bit\n\n", "Content-Transfer-Encoding: 8bit\n\n",
extra_headers ? extra_headers : "",
mime_boundary_leader, opt->mime_boundary, mime_boundary_leader, opt->mime_boundary,
mime_boundary_leader, opt->mime_boundary); mime_boundary_leader, opt->mime_boundary);
free(extra_headers);
extra_headers = strbuf_detach(&subject_buffer, NULL);


if (opt->numbered_files) if (opt->numbered_files)
strbuf_addf(&filename, "%d", opt->nr); strbuf_addf(&filename, "%d", opt->nr);
@ -539,7 +537,7 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit,
opt->diffopt.stat_sep = buffer.buf; opt->diffopt.stat_sep = buffer.buf;
strbuf_release(&filename); strbuf_release(&filename);
} }
*extra_headers_p = extra_headers; *extra_headers_p = headers.len ? strbuf_detach(&headers, NULL) : NULL;
} }


static void show_sig_lines(struct rev_info *opt, int status, const char *bol) static void show_sig_lines(struct rev_info *opt, int status, const char *bol)