From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Johan Herland <johan@herland.net>,
Josh Triplett <josh@joshtriplett.org>,
Thomas Rast <tr@thomasrast.ch>,
Michael Haggerty <mhagger@alum.mit.edu>,
Eric Sunshine <sunshine@sunshineco.com>,
Dan Carpenter <dan.carpenter@oracle.com>,
Greg Kroah-Hartman <greg@kroah.com>, Jeff King <peff@peff.net>
Subject: [PATCH v5 04/14] trailer: process command line trailer arguments
Date: Thu, 06 Feb 2014 21:19:53 +0100 [thread overview]
Message-ID: <20140206202004.325.93876.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20140206194123.325.99451.chriscool@tuxfamily.org>
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 | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 84 insertions(+)
diff --git a/trailer.c b/trailer.c
index f844f46..3fde21d 100644
--- a/trailer.c
+++ b/trailer.c
@@ -367,3 +367,87 @@ 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)
+{
+ const 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 *new_trailer_item(struct trailer_item *conf_item,
+ const char* tok, const char* val)
+{
+ struct trailer_item *new = xcalloc(sizeof(*new), 1);
+ new->value = val;
+
+ if (conf_item) {
+ new->conf = conf_item->conf;
+ new->token = xstrdup(conf_item->conf->key);
+ } else {
+ new->conf = xcalloc(sizeof(struct conf_info), 1);
+ new->token = tok;
+ }
+
+ return new;
+}
+
+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;
+
+ 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)) {
+ 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 (!*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.206.g98f5689.dirty
next prev parent reply other threads:[~2014-02-06 20:22 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-06 20:19 [PATCH v5 00/14] Add interpret-trailers builtin Christian Couder
2014-02-06 20:19 ` [PATCH v5 01/14] Add data structures and basic functions for commit trailers Christian Couder
2014-02-06 23:44 ` Junio C Hamano
2014-02-09 13:48 ` Christian Couder
2014-02-10 7:27 ` Eric Sunshine
2014-02-06 23:46 ` Junio C Hamano
2014-02-09 13:51 ` Christian Couder
2014-02-06 20:19 ` [PATCH v5 02/14] trailer: process trailers from file and arguments Christian Couder
2014-02-07 0:03 ` Junio C Hamano
2014-02-09 13:52 ` Christian Couder
2014-02-10 18:14 ` Junio C Hamano
2014-02-10 19:59 ` Christian Couder
2014-02-10 20:51 ` Junio C Hamano
2014-02-11 15:02 ` Christian Couder
2014-02-11 18:07 ` Junio C Hamano
2014-02-14 21:41 ` Christian Couder
2014-02-14 21:46 ` Junio C Hamano
2014-02-14 23:29 ` Christian Couder
2014-02-14 23:39 ` Junio C Hamano
2014-02-14 23:57 ` Junio C Hamano
2014-02-15 0:16 ` Junio C Hamano
2014-02-21 0:22 ` Junio C Hamano
2014-02-23 10:44 ` Christian Couder
2014-02-06 20:19 ` [PATCH v5 03/14] trailer: read and process config information Christian Couder
2014-02-06 20:19 ` Christian Couder [this message]
2014-02-07 0:08 ` [PATCH v5 04/14] trailer: process command line trailer arguments Junio C Hamano
2014-02-09 14:06 ` Christian Couder
2014-02-06 20:19 ` [PATCH v5 05/14] trailer: parse trailers from input file Christian Couder
2014-02-06 20:19 ` [PATCH v5 06/14] trailer: put all the processing together and print Christian Couder
2014-02-06 20:19 ` [PATCH v5 07/14] trailer: add interpret-trailers command Christian Couder
2014-02-07 0:10 ` Junio C Hamano
2014-02-07 8:34 ` Christian Couder
2014-02-07 18:09 ` Junio C Hamano
2014-02-07 20:35 ` Junio C Hamano
2014-02-06 20:19 ` [PATCH v5 08/14] trailer: add tests for "git interpret-trailers" Christian Couder
2014-02-07 0:11 ` Junio C Hamano
2014-02-06 20:19 ` [PATCH v5 09/14] trailer: if no input file is passed, read from stdin Christian Couder
2014-02-07 0:12 ` Junio C Hamano
2014-02-06 20:19 ` [PATCH v5 10/14] trailer: execute command from 'trailer.<name>.command' Christian Couder
2014-02-07 0:18 ` Junio C Hamano
2014-02-07 18:17 ` Junio C Hamano
2014-02-06 20:20 ` [PATCH v5 11/14] trailer: add tests for trailer command Christian Couder
2014-02-06 20:20 ` [PATCH v5 12/14] trailer: set author and committer env variables Christian Couder
2014-02-07 0:20 ` Junio C Hamano
2014-02-07 0:26 ` Junio C Hamano
2014-02-06 20:20 ` [PATCH v5 13/14] trailer: add tests for commands using " Christian Couder
2014-02-06 20:20 ` [PATCH v5 14/14] Documentation: add documentation for 'git interpret-trailers' Christian Couder
2014-02-10 7:17 ` Eric Sunshine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140206202004.325.93876.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=dan.carpenter@oracle.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=greg@kroah.com \
--cc=johan@herland.net \
--cc=josh@joshtriplett.org \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--cc=tr@thomasrast.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).