git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 v2 07/16] trailer: put all the processing together and print
Date: Sun, 19 Jan 2014 09:53:45 +0100	[thread overview]
Message-ID: <20140119085355.2734.29264.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20140119083636.2734.14378.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 36eb1f8..d2a4427 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.5.2.201.gacc5987

  parent reply	other threads:[~2014-01-19  8:55 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-19  8:53 [PATCH v2 00/16] Add interpret-trailers builtin Christian Couder
2014-01-19  8:53 ` [PATCH v2 01/16] Add data structures and basic functions for commit trailers Christian Couder
2014-01-19  8:53 ` [PATCH v2 02/16] trailer: process trailers from file and arguments Christian Couder
2014-01-19  8:53 ` [PATCH v2 03/16] trailer: read and process config information Christian Couder
2014-01-19  8:53 ` [PATCH v2 04/16] trailer: process command line trailer arguments Christian Couder
2014-01-21 22:41   ` Junio C Hamano
2014-01-21 22:50     ` Junio C Hamano
2014-01-26 17:28       ` Christian Couder
2014-01-19  8:53 ` [PATCH v2 05/16] strbuf: add strbuf_isspace() Christian Couder
2014-01-19  8:53 ` [PATCH v2 06/16] trailer: parse trailers from input file Christian Couder
2014-01-19  8:53 ` Christian Couder [this message]
2014-01-19  8:53 ` [PATCH v2 08/16] trailer: add interpret-trailers command Christian Couder
2014-01-19  8:53 ` [PATCH v2 09/16] trailer: add tests for "git interpret-trailers" Christian Couder
2014-01-19  8:53 ` [PATCH v2 10/16] trailer: if no input file is passed, read from stdin Christian Couder
2014-01-19  8:53 ` [PATCH v2 11/16] trailer: add new_trailer_item() function Christian Couder
2014-01-19  8:53 ` [PATCH v2 12/16] strbuf: add strbuf_replace() Christian Couder
2014-01-19  8:53 ` [PATCH v2 13/16] trailer: execute command from 'trailer.<name>.command' Christian Couder
2014-01-19  8:53 ` [PATCH v2 14/16] trailer: add tests for trailer command Christian Couder
2014-01-19  8:53 ` [PATCH v2 15/16] trailer: set author and committer env variables Christian Couder
2014-01-19  8:53 ` [PATCH v2 16/16] trailer: add tests for commands using " 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=20140119085355.2734.29264.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).