undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trailer: put all the processing together and print

Browse Source 
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>
This commit is contained in:
Christian Couder 2014-10-13 20:16:28 +02:00 committed by Junio C Hamano
parent 2013d8505d
commit b1d78d77bf
2 changed files with 75 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
trailer.c
View File

@ -1,5 +1,6 @@
#include "cache.h"
#include "string-list.h"
#include "trailer.h"
/*
* Copyright (c) 2013, 2014 Christian Couder <chriscool@tuxfamily.org>
*/
@ -87,6 +88,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)
@ -697,3 +727,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);
}

6
trailer.h Normal file
View File

@ -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 */