From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Couder Subject: [PATCH 7/9] trailer: put all the processing together and print Date: Tue, 24 Dec 2013 07:37:23 +0100 Message-ID: <20131224063726.19560.3793.chriscool@tuxfamily.org> References: <20131224061541.19560.17773.chriscool@tuxfamily.org> Cc: git@vger.kernel.org, Johan Herland , Josh Triplett , Thomas Rast , Michael Haggerty , Dan Carpenter , Greg Kroah-Hartman , Jeff King To: Junio C Hamano X-From: git-owner@vger.kernel.org Tue Dec 24 07:39:26 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VvLeF-0001vx-T8 for gcvg-git-2@plane.gmane.org; Tue, 24 Dec 2013 07:39:24 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751315Ab3LXGjL (ORCPT ); Tue, 24 Dec 2013 01:39:11 -0500 Received: from [194.158.98.15] ([194.158.98.15]:59748 "EHLO mail-2y.bbox.fr" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1750870Ab3LXGil (ORCPT ); Tue, 24 Dec 2013 01:38:41 -0500 Received: from [127.0.1.1] (cha92-h01-128-78-31-246.dsl.sta.abo.bbox.fr [128.78.31.246]) by mail-2y.bbox.fr (Postfix) with ESMTP id 9E95037; Tue, 24 Dec 2013 07:38:20 +0100 (CET) X-git-sha1: 3d349dc11c3b88a26cc61833291d49044c802b0b X-Mailer: git-mail-commits v0.5.2 In-Reply-To: <20131224061541.19560.17773.chriscool@tuxfamily.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 --- 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