From: Jonathan Tan <jonathantanmy@google.com>
To: git@vger.kernel.org
Cc: Jonathan Tan <jonathantanmy@google.com>, gitster@pobox.com
Subject: [PATCH v3 1/3] mailinfo: separate in-body header processing
Date: Tue, 20 Sep 2016 10:17:51 -0700 [thread overview]
Message-ID: <12ea344c46ed17ed90dd92bebc45be761a51ef80.1474391594.git.jonathantanmy@google.com> (raw)
In-Reply-To: <cover.1474391594.git.jonathantanmy@google.com>
In-Reply-To: <cover.1474391594.git.jonathantanmy@google.com>
The check_header function contains logic specific to in-body headers,
although it is invoked during both the processing of actual headers and
in-body headers. Separate out the in-body header part into its own
function.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
---
mailinfo.c | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/mailinfo.c b/mailinfo.c
index e19abe3..0c4738a 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -495,21 +495,6 @@ static int check_header(struct mailinfo *mi,
goto check_header_out;
}
- /* for inbody stuff */
- if (starts_with(line->buf, ">From") && isspace(line->buf[5])) {
- ret = is_format_patch_separator(line->buf + 1, line->len - 1);
- goto check_header_out;
- }
- if (starts_with(line->buf, "[PATCH]") && isspace(line->buf[7])) {
- for (i = 0; header[i]; i++) {
- if (!strcmp("Subject", header[i])) {
- handle_header(&hdr_data[i], line);
- ret = 1;
- goto check_header_out;
- }
- }
- }
-
check_header_out:
strbuf_release(&sb);
return ret;
@@ -623,6 +608,22 @@ static int is_scissors_line(const struct strbuf *line)
gap * 2 < perforation);
}
+static int check_inbody_header(struct mailinfo *mi, const struct strbuf *line)
+{
+ if (starts_with(line->buf, ">From") && isspace(line->buf[5]))
+ return is_format_patch_separator(line->buf + 1, line->len - 1);
+ if (starts_with(line->buf, "[PATCH]") && isspace(line->buf[7])) {
+ int i;
+ for (i = 0; header[i]; i++)
+ if (!strcmp("Subject", header[i])) {
+ handle_header(&mi->s_hdr_data[i], line);
+ return 1;
+ }
+ return 0;
+ }
+ return check_header(mi, line, mi->s_hdr_data, 0);
+}
+
static int handle_commit_msg(struct mailinfo *mi, struct strbuf *line)
{
assert(!mi->filter_stage);
@@ -633,7 +634,7 @@ static int handle_commit_msg(struct mailinfo *mi, struct strbuf *line)
}
if (mi->use_inbody_headers && mi->header_stage) {
- mi->header_stage = check_header(mi, line, mi->s_hdr_data, 0);
+ mi->header_stage = check_inbody_header(mi, line);
if (mi->header_stage)
return 0;
} else
--
2.10.0.rc2.20.g5b18e70
next prev parent reply other threads:[~2016-09-20 17:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-19 21:08 [PATCH v2 0/4] handle multiline in-body headers Jonathan Tan
2016-09-19 21:08 ` [PATCH v2 1/4] mailinfo: separate in-body header processing Jonathan Tan
2016-09-19 21:08 ` [PATCH v2 2/4] mailinfo: refactor to support utf8 decode attempts Jonathan Tan
2016-09-19 21:08 ` [PATCH v2 3/4] mailinfo: make is_scissors_line take plain char * Jonathan Tan
2016-09-19 21:08 ` [PATCH v2 4/4] mailinfo: handle in-body header continuations Jonathan Tan
2016-09-19 21:39 ` [PATCH v2 0/4] handle multiline in-body headers Junio C Hamano
2016-09-20 17:17 ` [PATCH v3 0/3] " Jonathan Tan
2016-09-20 23:06 ` Jeff King
2016-09-21 17:24 ` Junio C Hamano
2016-09-20 17:17 ` Jonathan Tan [this message]
2016-09-20 17:17 ` [PATCH v3 2/3] mailinfo: make is_scissors_line take plain char * Jonathan Tan
2016-09-20 17:17 ` [PATCH v3 3/3] mailinfo: handle in-body header continuations Jonathan Tan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=12ea344c46ed17ed90dd92bebc45be761a51ef80.1474391594.git.jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).