From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Couder Subject: [PATCH v3 04/17] trailer: process command line trailer arguments Date: Sun, 26 Jan 2014 17:59:57 +0100 Message-ID: <20140126170011.24291.14120.chriscool@tuxfamily.org> References: <20140126165018.24291.47716.chriscool@tuxfamily.org> Cc: git@vger.kernel.org, Johan Herland , Josh Triplett , Thomas Rast , Michael Haggerty , Dan Carpenter , Greg Kroah-Hartman , Jeff King To: Junio C Hamano X-From: git-owner@vger.kernel.org Sun Jan 26 18:24:56 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 1W7TS4-0004eY-0e for gcvg-git-2@plane.gmane.org; Sun, 26 Jan 2014 18:24:56 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753216AbaAZRYv (ORCPT ); Sun, 26 Jan 2014 12:24:51 -0500 Received: from mail-1y.bbox.fr ([194.158.98.14]:43116 "EHLO mail-1y.bbox.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752701AbaAZRX6 (ORCPT ); Sun, 26 Jan 2014 12:23:58 -0500 Received: from [127.0.1.1] (cha92-h01-128-78-31-246.dsl.sta.abo.bbox.fr [128.78.31.246]) by mail-1y.bbox.fr (Postfix) with ESMTP id EAE7774; Sun, 26 Jan 2014 18:23:56 +0100 (CET) X-git-sha1: 1d277326247f5d31a8565468a26fa55de15e516a X-Mailer: git-mail-commits v0.5.2 In-Reply-To: <20140126165018.24291.47716.chriscool@tuxfamily.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This patch parses the trailer command line arguments and put the result into an arg_tok doubly linked list. Signed-off-by: Christian Couder --- trailer.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/trailer.c b/trailer.c index e7d8244..89377f2 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; + struct trailer_item *item; + int tok_alnum_len; + + parse_trailer(&tok, &val, string); + + 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 (!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; +} -- 1.8.5.2.201.gacc5987