From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Johan Herland <johan@herland.net>,
Josh Triplett <josh@joshtriplett.org>,
Thomas Rast <tr@thomasrast.ch>,
Michael Haggerty <mhagger@alum.mit.edu>,
Eric Sunshine <sunshine@sunshineco.com>,
Dan Carpenter <dan.carpenter@oracle.com>,
Greg Kroah-Hartman <greg@kroah.com>, Jeff King <peff@peff.net>
Subject: [PATCH v4 06/17] trailer: parse trailers from input file
Date: Thu, 30 Jan 2014 07:49:09 +0100 [thread overview]
Message-ID: <20140130064921.7504.62053.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20140130064217.7504.473.chriscool@tuxfamily.org>
This patch reads trailers from an input file, parses
them and puts the result into a doubly linked list.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
trailer.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/trailer.c b/trailer.c
index f48fd94..084b3e1 100644
--- a/trailer.c
+++ b/trailer.c
@@ -439,3 +439,65 @@ static struct trailer_item *process_command_line_args(int argc, const char **arg
return arg_tok_first;
}
+
+static struct strbuf **read_input_file(const char *infile)
+{
+ struct strbuf sb = STRBUF_INIT;
+
+ if (strbuf_read_file(&sb, infile, 0) < 0)
+ die_errno(_("could not read input file '%s'"), infile);
+
+ return strbuf_split(&sb, '\n');
+}
+
+/*
+ * Return the the (0 based) index of the first trailer line
+ * or the line count if there are no trailers.
+ */
+static int find_trailer_start(struct strbuf **lines)
+{
+ int count, start, empty = 1;
+
+ /* Get the line count */
+ for (count = 0; lines[count]; count++);
+
+ /*
+ * Get the start of the trailers by looking starting from the end
+ * for a line with only spaces before lines with one ':'.
+ */
+ for (start = count - 1; start >= 0; start--) {
+ if (strbuf_isspace(lines[start])) {
+ if (empty)
+ continue;
+ return start + 1;
+ }
+ if (strchr(lines[start]->buf, ':')) {
+ if (empty)
+ empty = 0;
+ continue;
+ }
+ return count;
+ }
+
+ return empty ? count : start + 1;
+}
+
+static void process_input_file(const char *infile,
+ struct trailer_item **infile_tok_first,
+ struct trailer_item **infile_tok_last)
+{
+ struct strbuf **lines = read_input_file(infile);
+ int start = find_trailer_start(lines);
+ int i;
+
+ /* Print non trailer lines as is */
+ for (i = 0; lines[i] && i < start; i++) {
+ printf("%s", lines[i]->buf);
+ }
+
+ /* Parse trailer lines */
+ for (i = start; lines[i]; i++) {
+ struct trailer_item *new = create_trailer_item(lines[i]->buf);
+ add_trailer_item(infile_tok_first, infile_tok_last, new);
+ }
+}
--
1.8.5.2.201.gacc5987
next prev parent reply other threads:[~2014-01-30 7:38 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-30 6:49 [PATCH v4 00/17] Add interpret-trailers builtin Christian Couder
2014-01-30 6:49 ` [PATCH v4 01/17] Add data structures and basic functions for commit trailers Christian Couder
2014-01-30 9:10 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 02/17] trailer: process trailers from file and arguments Christian Couder
2014-01-31 4:02 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 03/17] trailer: read and process config information Christian Couder
2014-01-31 15:43 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 04/17] trailer: process command line trailer arguments Christian Couder
2014-01-31 16:30 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 05/17] strbuf: add strbuf_isspace() Christian Couder
2014-01-31 2:51 ` Eric Sunshine
2014-01-31 3:09 ` Eric Sunshine
2014-01-30 6:49 ` Christian Couder [this message]
2014-01-31 16:45 ` [PATCH v4 06/17] trailer: parse trailers from input file Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 07/17] trailer: put all the processing together and print Christian Couder
2014-01-30 6:49 ` [PATCH v4 08/17] trailer: add interpret-trailers command Christian Couder
2014-01-31 16:10 ` Eric Sunshine
2014-02-06 20:12 ` Christian Couder
2014-01-30 6:49 ` [PATCH v4 09/17] trailer: add tests for "git interpret-trailers" Christian Couder
2014-01-30 6:49 ` [PATCH v4 10/17] trailer: if no input file is passed, read from stdin Christian Couder
2014-02-02 9:50 ` Eric Sunshine
2014-02-06 20:16 ` Christian Couder
2014-02-06 21:51 ` Junio C Hamano
2014-02-09 13:55 ` Christian Couder
2014-01-30 6:49 ` [PATCH v4 11/17] trailer: add new_trailer_item() function Christian Couder
2014-02-02 10:10 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 12/17] strbuf: add strbuf_replace() Christian Couder
2014-01-31 3:11 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 13/17] trailer: execute command from 'trailer.<name>.command' Christian Couder
2014-01-30 6:49 ` [PATCH v4 14/17] trailer: add tests for trailer command Christian Couder
2014-01-30 6:49 ` [PATCH v4 15/17] trailer: set author and committer env variables Christian Couder
2014-01-30 6:49 ` [PATCH v4 16/17] trailer: add tests for commands using " Christian Couder
2014-01-30 6:49 ` [PATCH v4 17/17] Documentation: add documentation for 'git interpret-trailers' Christian Couder
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140130064921.7504.62053.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=dan.carpenter@oracle.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=greg@kroah.com \
--cc=johan@herland.net \
--cc=josh@joshtriplett.org \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--cc=tr@thomasrast.ch \
/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.
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 NNTP newsgroup(s).