From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Couder Subject: [PATCH v13 04/11] trailer: process command line trailer arguments Date: Sat, 16 Aug 2014 18:06:14 +0200 Message-ID: <20140816160622.18221.49794.chriscool@tuxfamily.org> References: <20140816153440.18221.29179.chriscool@tuxfamily.org> Cc: git@vger.kernel.org, Johan Herland , Josh Triplett , Thomas Rast , Michael Haggerty , Dan Carpenter , Greg Kroah-Hartman , Jeff King , Jakub Narebski , Eric Sunshine , Ramsay Jones , Jonathan Nieder To: Junio C Hamano X-From: git-owner@vger.kernel.org Sat Aug 16 18:30:39 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 1XIgsI-0005LP-M8 for gcvg-git-2@plane.gmane.org; Sat, 16 Aug 2014 18:30:39 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751633AbaHPQae (ORCPT ); Sat, 16 Aug 2014 12:30:34 -0400 Received: from gleek.ethostream.com ([66.195.129.15]:57333 "EHLO barracuda.ethostream.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751537AbaHPQab (ORCPT ); Sat, 16 Aug 2014 12:30:31 -0400 X-ASG-Debug-ID: 1408205475-016a7707b5114cf10001-QuoKaX Received: from relay.ethostream.com (www1.ethostream.com [66.195.129.11]) by barracuda.ethostream.com with ESMTP id eCA2Uw3TfizB59xH; Sat, 16 Aug 2014 11:11:15 -0500 (CDT) X-Barracuda-Envelope-From: chriscool@tuxfamily.org X-Barracuda-Apparent-Source-IP: 66.195.129.11 Received: from ethoserver.ezone.net (unknown [10.230.15.218]) by relay.ethostream.com (Postfix) with ESMTPA id 8A40389177B; Sat, 16 Aug 2014 11:11:15 -0500 (CDT) Received: from [127.0.1.1] (unknown [10.0.7.4]) by ethoserver.ezone.net (Postfix) with ESMTP id 4ED8FC54916; Sat, 16 Aug 2014 11:11:15 -0500 (CDT) X-ASG-Orig-Subj: [PATCH v13 04/11] trailer: process command line trailer arguments X-git-sha1: 1f5ea96a15b0c90e548c23b69ef90a9def043f91 X-Mailer: git-mail-commits v0.5.2 In-Reply-To: <20140816153440.18221.29179.chriscool@tuxfamily.org> X-Barracuda-Connect: www1.ethostream.com[66.195.129.11] X-Barracuda-Start-Time: 1408205475 X-Barracuda-URL: http://66.195.129.15:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at ethostream.com X-Barracuda-Spam-Score: 3.38 X-Barracuda-Spam-Status: No, SCORE=3.38 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=5.0 tests=FH_DATE_PAST_20XX X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.138343 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 3.38 FH_DATE_PAST_20XX The date is grossly in the future. Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Parse the trailer command line arguments and put the result into an arg_tok doubly linked list. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- trailer.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/trailer.c b/trailer.c index 2d391f3..b9d3ed4 100644 --- a/trailer.c +++ b/trailer.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "string-list.h" /* * Copyright (c) 2013, 2014 Christian Couder */ @@ -457,3 +458,127 @@ static int git_trailer_config(const char *conf_key, const char *value, void *cb) } return 0; } + +static int parse_trailer(struct strbuf *tok, struct strbuf *val, const char *trailer) +{ + size_t len; + struct strbuf seps = STRBUF_INIT; + strbuf_addstr(&seps, separators); + strbuf_addch(&seps, '='); + len = strcspn(trailer, seps.buf); + strbuf_release(&seps); + if (len == 0) + return error(_("empty trailer token in trailer '%s'"), trailer); + if (len < strlen(trailer)) { + strbuf_add(tok, trailer, len); + strbuf_trim(tok); + strbuf_addstr(val, trailer + len + 1); + strbuf_trim(val); + } else { + strbuf_addstr(tok, trailer); + strbuf_trim(tok); + } + 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) + return item->conf.key; + + return item->conf.name; +} + +static struct trailer_item *new_trailer_item(struct trailer_item *conf_item, + char *tok, char *val) +{ + struct trailer_item *new = xcalloc(sizeof(*new), 1); + new->value = val; + + if (conf_item) { + duplicate_conf(&new->conf, &conf_item->conf); + new->token = xstrdup(token_from_item(conf_item)); + free(tok); + } else { + duplicate_conf(&new->conf, &default_conf_info); + new->token = tok; + } + + return new; +} + +static int token_matches_item(const char *tok, struct trailer_item *item, int alnum_len) +{ + if (!strncasecmp(tok, item->conf.name, alnum_len)) + return 1; + return item->conf.key ? !strncasecmp(tok, item->conf.key, alnum_len) : 0; +} + +static struct trailer_item *create_trailer_item(const char *string) +{ + struct strbuf tok = STRBUF_INIT; + struct strbuf val = STRBUF_INIT; + struct trailer_item *item; + int tok_alnum_len; + + if (parse_trailer(&tok, &val, string)) + return NULL; + + tok_alnum_len = alnum_len(tok.buf, tok.len); + + /* Lookup if the token matches something in the config */ + for (item = first_conf_item; item; item = item->next) { + if (token_matches_item(tok.buf, item, tok_alnum_len)) { + strbuf_release(&tok); + return new_trailer_item(item, + NULL, + strbuf_detach(&val, NULL)); + } + } + + return new_trailer_item(NULL, + strbuf_detach(&tok, NULL), + strbuf_detach(&val, NULL)); +} + +static void add_trailer_item(struct trailer_item **first, + struct trailer_item **last, + struct trailer_item *new) +{ + if (!new) + return; + if (!*last) { + *first = new; + *last = new; + } else { + (*last)->next = new; + new->previous = *last; + *last = new; + } +} + +static struct trailer_item *process_command_line_args(struct string_list *trailers) +{ + struct trailer_item *arg_tok_first = NULL; + struct trailer_item *arg_tok_last = NULL; + struct string_list_item *tr; + + for_each_string_list_item(tr, trailers) { + struct trailer_item *new = create_trailer_item(tr->string); + add_trailer_item(&arg_tok_first, &arg_tok_last, new); + } + + return arg_tok_first; +} -- 2.0.1.674.ga7f57b7