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>,
Jakub Narebski <jnareb@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Ramsay Jones <ramsay@ramsay1.demon.co.uk>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH v13 06/11] trailer: put all the processing together and print
Date: Sat, 16 Aug 2014 18:06:16 +0200 [thread overview]
Message-ID: <20140816160622.18221.98107.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20140816153440.18221.29179.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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
trailer.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------
trailer.h | 6 +++++
2 files changed, 75 insertions(+), 12 deletions(-)
create mode 100644 trailer.h
diff --git a/trailer.c b/trailer.c
index 46e2fcb..8e41b8f 100644
--- a/trailer.c
+++ b/trailer.c
@@ -1,5 +1,6 @@
#include "cache.h"
#include "string-list.h"
+#include "trailer.h"
/*
* Copyright (c) 2013, 2014 Christian Couder <chriscool@tuxfamily.org>
*/
@@ -82,6 +83,35 @@ static void free_trailer_item(struct trailer_item *item)
free(item);
}
+static char last_non_space_char(const char *s)
+{
+ int i;
+ for (i = strlen(s) - 1; i >= 0; i--)
+ if (!isspace(s[i]))
+ return s[i];
+ return '\0';
+}
+
+static void print_tok_val(const char *tok, const char *val)
+{
+ char c = last_non_space_char(tok);
+ if (!c)
+ return;
+ if (strchr(separators, c))
+ printf("%s%s\n", tok, val);
+ else
+ printf("%s%c %s\n", tok, separators[0], 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 update_last(struct trailer_item **last)
{
if (*last)
@@ -489,18 +519,6 @@ static int parse_trailer(struct strbuf *tok, struct strbuf *val, const char *tra
return 0;
}
-
-static void duplicate_conf(struct conf_info *dst, struct conf_info *src)
-{
- *dst = *src;
- if (src->name)
- dst->name = xstrdup(src->name);
- if (src->key)
- dst->key = xstrdup(src->key);
- if (src->command)
- dst->command = xstrdup(src->command);
-}
-
static const char *token_from_item(struct trailer_item *item)
{
if (item->conf.key)
@@ -705,3 +723,42 @@ static int process_input_file(struct strbuf **lines,
return patch_start;
}
+
+static void free_all(struct trailer_item **first)
+{
+ while (*first) {
+ struct trailer_item *item = remove_first(first);
+ free_trailer_item(item);
+ }
+}
+
+void process_trailers(const char *file, int trim_empty, struct string_list *trailers)
+{
+ struct trailer_item *in_tok_first = NULL;
+ struct trailer_item *in_tok_last = NULL;
+ struct trailer_item *arg_tok_first;
+ struct strbuf **lines;
+ int patch_start;
+
+ /* Default config must be setup first */
+ git_config(git_trailer_default_config, NULL);
+ git_config(git_trailer_config, NULL);
+
+ lines = read_input_file(file);
+
+ /* Print the lines before the trailers */
+ patch_start = process_input_file(lines, &in_tok_first, &in_tok_last);
+
+ arg_tok_first = process_command_line_args(trailers);
+
+ process_trailers_lists(&in_tok_first, &in_tok_last, &arg_tok_first);
+
+ print_all(in_tok_first, trim_empty);
+
+ free_all(&in_tok_first);
+
+ /* Print the lines after the trailers as is */
+ print_lines(lines, patch_start, INT_MAX);
+
+ strbuf_list_free(lines);
+}
diff --git a/trailer.h b/trailer.h
new file mode 100644
index 0000000..8eb25d5
--- /dev/null
+++ b/trailer.h
@@ -0,0 +1,6 @@
+#ifndef TRAILER_H
+#define TRAILER_H
+
+void process_trailers(const char *file, int trim_empty, struct string_list *trailers);
+
+#endif /* TRAILER_H */
--
2.0.1.674.ga7f57b7
next prev parent reply other threads:[~2014-08-16 16:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-16 16:06 [PATCH v13 00/11] Add interpret-trailers builtin Christian Couder
2014-08-16 16:06 ` [PATCH v13 01/11] trailer: add data structures and basic functions Christian Couder
2014-08-16 16:06 ` [PATCH v13 02/11] trailer: process trailers from input message and arguments Christian Couder
2014-08-16 16:06 ` [PATCH v13 03/11] trailer: read and process config information Christian Couder
2014-08-16 16:06 ` [PATCH v13 04/11] trailer: process command line trailer arguments Christian Couder
2014-08-16 16:06 ` [PATCH v13 05/11] trailer: parse trailers from file or stdin Christian Couder
2014-08-16 16:06 ` Christian Couder [this message]
2014-08-16 16:06 ` [PATCH v13 07/11] trailer: add interpret-trailers command Christian Couder
2014-08-16 16:06 ` [PATCH v13 08/11] trailer: add tests for "git interpret-trailers" Christian Couder
2014-08-16 16:06 ` [PATCH v13 09/11] trailer: execute command from 'trailer.<name>.command' Christian Couder
2014-08-16 16:06 ` [PATCH v13 10/11] trailer: add tests for commands in config file Christian Couder
2014-08-16 16:06 ` [PATCH v13 11/11] Documentation: add documentation for 'git interpret-trailers' Christian Couder
2014-08-20 22:05 ` Marc Branchaud
2014-08-21 3:39 ` Christian Couder
2014-08-21 14:16 ` Marc Branchaud
2014-08-16 22:25 ` [PATCH v13 00/11] Add interpret-trailers builtin Christian Couder
2014-09-03 21:30 ` Junio C Hamano
2014-09-15 6:04 ` 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=20140816160622.18221.98107.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=jnareb@gmail.com \
--cc=johan@herland.net \
--cc=josh@joshtriplett.org \
--cc=jrnieder@gmail.com \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=ramsay@ramsay1.demon.co.uk \
--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).