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

mailinfo: move keep_subject & keep_non_patch_bracket to struct mailinfo 

These two are the only easy ones that do not require passing the
structure around to deep corners of the callchain.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2015-10-14 15:39:37 -07:00
parent c69f2395ba
commit 849106d511
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/mailinfo.c
View File

@ -9,13 +9,13 @@


static FILE *cmitmsg, *patchfile, *fin, *fout; static FILE *cmitmsg, *patchfile, *fin, *fout;


static int keep_subject;
static int keep_non_patch_brackets_in_subject;
static const char *metainfo_charset; static const char *metainfo_charset;


struct mailinfo { struct mailinfo {
struct strbuf name; struct strbuf name;
struct strbuf email; struct strbuf email;
int keep_subject;
int keep_non_patch_brackets_in_subject;
}; };
static char *message_id; static char *message_id;


@ -232,7 +232,7 @@ static int is_multipart_boundary(const struct strbuf *line)
!memcmp(line->buf, (*content_top)->buf, (*content_top)->len)); !memcmp(line->buf, (*content_top)->buf, (*content_top)->len));
} }


static void cleanup_subject(struct strbuf *subject) static void cleanup_subject(struct mailinfo *mi, struct strbuf *subject)
{ {
size_t at = 0; size_t at = 0;


@ -260,7 +260,7 @@ static void cleanup_subject(struct strbuf *subject)
if (!pos) if (!pos)
break; break;
remove = pos - subject->buf + at + 1; remove = pos - subject->buf + at + 1;
if (!keep_non_patch_brackets_in_subject || if (!mi->keep_non_patch_brackets_in_subject ||
(7 <= remove && (7 <= remove &&
memmem(subject->buf + at, remove, "PATCH", 5))) memmem(subject->buf + at, remove, "PATCH", 5)))
strbuf_remove(subject, at, remove); strbuf_remove(subject, at, remove);
@ -945,8 +945,8 @@ static void handle_info(struct mailinfo *mi)
continue; continue;


if (!strcmp(header[i], "Subject")) { if (!strcmp(header[i], "Subject")) {
if (!keep_subject) { if (!mi->keep_subject) {
cleanup_subject(hdr); cleanup_subject(mi, hdr);
cleanup_space(hdr); cleanup_space(hdr);
} }
output_header_lines(fout, "Subject", hdr); output_header_lines(fout, "Subject", hdr);
@ -1049,9 +1049,9 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix)


while (1 < argc && argv[1][0] == '-') { while (1 < argc && argv[1][0] == '-') {
if (!strcmp(argv[1], "-k")) if (!strcmp(argv[1], "-k"))
keep_subject = 1; mi.keep_subject = 1;
else if (!strcmp(argv[1], "-b")) else if (!strcmp(argv[1], "-b"))
keep_non_patch_brackets_in_subject = 1; mi.keep_non_patch_brackets_in_subject = 1;
else if (!strcmp(argv[1], "-m") || !strcmp(argv[1], "--message-id")) else if (!strcmp(argv[1], "-m") || !strcmp(argv[1], "--message-id"))
add_message_id = 1; add_message_id = 1;
else if (!strcmp(argv[1], "-u")) else if (!strcmp(argv[1], "-u"))