Re: [PATCH v2 04/16] trailer: process command line trailer arguments

[Junio C Hamano <gitster@pobox.com>]

Christian Couder <chriscool@tuxfamily.org> writes:

> This patch parses the trailer command line arguments
> and put the result into an arg_tok doubly linked
> list.
>
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
>  trailer.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 77 insertions(+)
>
> diff --git a/trailer.c b/trailer.c
> index e7d8244..bb1fcfb 100644
> --- a/trailer.c
> +++ b/trailer.c
> @@ -363,3 +363,80 @@ static int git_trailer_config(const char *conf_key, const char *value, void *cb)
>  	}
>  	return 0;
>  }
> +
> +static void parse_trailer(struct strbuf *tok, struct strbuf *val, const char *trailer)
> +{
> +	char *end = strchr(trailer, '=');
> +	if (!end)
> +		end = strchr(trailer, ':');
> +	if (end) {
> +		strbuf_add(tok, trailer, end - trailer);
> +		strbuf_trim(tok);
> +		strbuf_addstr(val, end + 1);
> +		strbuf_trim(val);
> +	} else {
> +		strbuf_addstr(tok, trailer);
> +		strbuf_trim(tok);
> +	}
> +}
> +
> +static struct trailer_item *create_trailer_item(const char *string)
> +{
> +	struct strbuf tok = STRBUF_INIT;
> +	struct strbuf val = STRBUF_INIT;
> +	struct trailer_item *new;
> +
> +	parse_trailer(&tok, &val, string);
> +
> +	int tok_alnum_len = alnum_len(tok.buf, tok.len);

decl-after-stmt.

> +
> +	/* Lookup if the token matches something in the config */
> +	struct trailer_item *item;
> +	for (item = first_conf_item; item; item = item->next)
> +	{
> +		if (!strncasecmp(tok.buf, item->conf->key, tok_alnum_len) ||
> +		    !strncasecmp(tok.buf, item->conf->name, tok_alnum_len)) {
> +			new = xcalloc(sizeof(struct trailer_item), 1);
> +			new->conf = item->conf;
> +			new->token = xstrdup(item->conf->key);
> +			new->value = strbuf_detach(&val, NULL);
> +			strbuf_release(&tok);
> +			return new;
> +		}
> +	}
> +
> +	new = xcalloc(sizeof(struct trailer_item), 1);
> +	new->conf = xcalloc(sizeof(struct conf_info), 1);
> +	new->token = strbuf_detach(&tok, NULL);
> +	new->value = strbuf_detach(&val, NULL);
> +
> +	return new;
> +}
> +
> +static void add_trailer_item(struct trailer_item **first,
> +			     struct trailer_item **last,
> +			     struct trailer_item *new)
> +{
> +	if (!*last) {
> +		*first = new;
> +		*last = new;
> +	} else {
> +		(*last)->next = new;
> +		new->previous = *last;
> +		*last = new;
> +	}
> +}
> +
> +static struct trailer_item *process_command_line_args(int argc, const char **argv)
> +{
> +	int i;
> +	struct trailer_item *arg_tok_first = NULL;
> +	struct trailer_item *arg_tok_last = NULL;
> +
> +	for (i = 0; i < argc; i++) {
> +		struct trailer_item *new = create_trailer_item(argv[i]);
> +		add_trailer_item(&arg_tok_first, &arg_tok_last, new);
> +	}
> +
> +	return arg_tok_first;
> +}