From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Couder Subject: [PATCH v10 06/12] trailer: put all the processing together and print Date: Sun, 06 Apr 2014 19:01:57 +0200 Message-ID: <20140406170204.15116.73542.chriscool@tuxfamily.org> References: <20140406163214.15116.91484.chriscool@tuxfamily.org> Cc: git@vger.kernel.org, Johan Herland , Josh Triplett , Thomas Rast , Michael Haggerty , Dan Carpenter , Greg Kroah-Hartman , Jeff King , Eric Sunshine , Ramsay Jones , Jonathan Nieder To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Apr 07 20:44:15 2014 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 1WXEWk-0003Tp-Fg for gcvg-git-2@plane.gmane.org; Mon, 07 Apr 2014 20:44:14 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756019AbaDGSoG (ORCPT ); Mon, 7 Apr 2014 14:44:06 -0400 Received: from mail-1y.bbox.fr ([194.158.98.14]:46736 "EHLO mail-1y.bbox.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755867AbaDGSoD (ORCPT ); Mon, 7 Apr 2014 14:44:03 -0400 Received: from [127.0.1.1] (cha92-h01-128-78-31-246.dsl.sta.abo.bbox.fr [128.78.31.246]) by mail-1y.bbox.fr (Postfix) with ESMTP id 3A4917B; Mon, 7 Apr 2014 20:44:01 +0200 (CEST) X-git-sha1: 64da019644e528705353beeb032153faf88bc1a9 X-Mailer: git-mail-commits v0.5.2 In-Reply-To: <20140406163214.15116.91484.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 Signed-off-by: Junio C Hamano --- trailer.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ trailer.h | 6 ++++++ 2 files changed, 55 insertions(+) create mode 100644 trailer.h diff --git a/trailer.c b/trailer.c index 6d2da32..16465e5 100644 --- a/trailer.c +++ b/trailer.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "trailer.h" /* * Copyright (c) 2013, 2014 Christian Couder */ @@ -68,6 +69,26 @@ static void free_trailer_item(struct trailer_item *item) free(item); } +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_input_list(struct trailer_item *in_tok, struct trailer_item *arg_tok) { @@ -584,3 +605,31 @@ static void process_stdin(struct trailer_item **in_tok_first, strbuf_list_free(lines); } + +static void free_all(struct trailer_item **first) +{ + while (*first) { + struct trailer_item *item = remove_first(first); + free_trailer_item(item); + } +} + +void process_trailers(int trim_empty, int argc, const char **argv) +{ + struct trailer_item *in_tok_first = NULL; + struct trailer_item *in_tok_last = NULL; + struct trailer_item *arg_tok_first; + + git_config(git_trailer_config, NULL); + + /* Print the non trailer part of stdin */ + process_stdin(&in_tok_first, &in_tok_last); + + arg_tok_first = process_command_line_args(argc, argv); + + process_trailers_lists(&in_tok_first, &in_tok_last, &arg_tok_first); + + print_all(in_tok_first, trim_empty); + + free_all(&in_tok_first); +} diff --git a/trailer.h b/trailer.h new file mode 100644 index 0000000..9323b1e --- /dev/null +++ b/trailer.h @@ -0,0 +1,6 @@ +#ifndef TRAILER_H +#define TRAILER_H + +void process_trailers(int trim_empty, int argc, const char **argv); + +#endif /* TRAILER_H */ -- 1.9.0.163.g8ca203c