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 <chrisc...@tuxfamily.org>
---
 trailer.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/trailer.c b/trailer.c
index f59efd1..186316f 100644
--- a/trailer.c
+++ b/trailer.c
@@ -56,6 +56,26 @@ static inline int contains_only_spaces(const char *str)
        return !*s;
 }
 
+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)
 {
@@ -522,3 +542,23 @@ static void process_input_file(const char *infile,
 
        strbuf_list_free(lines);
 }
+
+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.206.g98f5689.dirty


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to