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>,
Dan Carpenter <dan.carpenter@oracle.com>,
Greg Kroah-Hartman <greg@kroah.com>, Jeff King <peff@peff.net>
Subject: [PATCH 7/9] trailer: put all the processing together and print
Date: Tue, 24 Dec 2013 07:37:23 +0100 [thread overview]
Message-ID: <20131224063726.19560.3793.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20131224061541.19560.17773.chriscool@tuxfamily.org>
This patch adds the process_trailers() function that
calls all the previously added processing functions
and then prints the results on the standard output.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
trailer.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/trailer.c b/trailer.c
index 22d3ea3..33aa907 100644
--- a/trailer.c
+++ b/trailer.c
@@ -48,6 +48,26 @@ static size_t alnum_len(const char *buf, size_t len) {
return len + 1;
}
+static void print_tok_val(const char *tok, const char *val)
+{
+ char c = tok[strlen(tok) - 1];
+ if (isalnum(c))
+ printf("%s: %s\n", tok, val);
+ else if (isspace(c) || c == '#')
+ printf("%s%s\n", tok, val);
+ else
+ printf("%s %s\n", tok, val);
+}
+
+static void print_all(struct trailer_item *first, int trim_empty)
+{
+ struct trailer_item *item;
+ for (item = first; item; item = item->next) {
+ if (!trim_empty || strlen(item->value) > 0)
+ print_tok_val(item->token, item->value);
+ }
+}
+
static void add_arg_to_infile(struct trailer_item *infile_tok,
struct trailer_item *arg_tok)
{
@@ -502,3 +522,23 @@ static void process_input_file(const char *infile,
add_trailer_item(infile_tok_first, infile_tok_last, new);
}
}
+
+void process_trailers(const char *infile, int trim_empty, int argc, const char **argv)
+{
+ struct trailer_item *infile_tok_first = NULL;
+ struct trailer_item *infile_tok_last = NULL;
+ struct trailer_item *arg_tok_first;
+
+ git_config(git_trailer_config, NULL);
+
+ /* Print the non trailer part of infile */
+ if (infile) {
+ process_input_file(infile, &infile_tok_first, &infile_tok_last);
+ }
+
+ arg_tok_first = process_command_line_args(argc, argv);
+
+ process_trailers_lists(&infile_tok_first, &infile_tok_last, &arg_tok_first);
+
+ print_all(infile_tok_first, trim_empty);
+}
--
1.8.4.1.616.g07f5c81
next prev parent reply other threads:[~2013-12-24 6:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-24 6:37 [PATCH 0/9] Add interpret-trailers builtin Christian Couder
2013-12-24 6:37 ` [PATCH 1/9] Add data structures and basic functions for commit trailers Christian Couder
2013-12-24 6:37 ` [PATCH 2/9] trailer: process trailers from file and arguments Christian Couder
2013-12-24 6:37 ` [PATCH 3/9] trailer: read and process config information Christian Couder
2013-12-24 13:47 ` Christian Couder
2013-12-24 6:37 ` [PATCH 4/9] trailer: process command line trailer arguments Christian Couder
2013-12-24 6:37 ` [PATCH 5/9] strbuf: add strbuf_isspace() Christian Couder
2013-12-24 6:37 ` [PATCH 6/9] trailer: parse trailers from input file Christian Couder
2013-12-24 6:37 ` Christian Couder [this message]
2013-12-24 6:37 ` [PATCH 8/9] trailer: add interpret-trailers command Christian Couder
2013-12-24 6:37 ` [PATCH 9/9] trailer: add tests for "git interpret-trailers" Christian Couder
2013-12-30 17:19 ` Junio C Hamano
2013-12-30 20:20 ` Josh Triplett
2013-12-30 20:46 ` Junio C Hamano
2013-12-30 20:52 ` Josh Triplett
2013-12-30 21:05 ` Junio C Hamano
2013-12-30 22:27 ` Josh Triplett
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=20131224063726.19560.3793.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=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).