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>,
Dan Carpenter <dan.carpenter@oracle.com>,
Greg Kroah-Hartman <greg@kroah.com>, Jeff King <peff@peff.net>
Subject: [PATCH 4/9] trailer: process command line trailer arguments
Date: Tue, 24 Dec 2013 07:37:20 +0100 [thread overview]
Message-ID: <20131224063726.19560.28979.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20131224061541.19560.17773.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 | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 77 insertions(+)
diff --git a/trailer.c b/trailer.c
index 6aba40e..b572c44 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);
+
+ /* 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;
+}
--
1.8.4.1.616.g07f5c81
next prev parent reply other threads:[~2013-12-24 6:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-24 6:37 [PATCH 0/9] Add interpret-trailers builtin Christian Couder
2013-12-24 6:37 ` [PATCH 1/9] Add data structures and basic functions for commit trailers Christian Couder
2013-12-24 6:37 ` [PATCH 2/9] trailer: process trailers from file and arguments Christian Couder
2013-12-24 6:37 ` [PATCH 3/9] trailer: read and process config information Christian Couder
2013-12-24 13:47 ` Christian Couder
2013-12-24 6:37 ` Christian Couder [this message]
2013-12-24 6:37 ` [PATCH 5/9] strbuf: add strbuf_isspace() Christian Couder
2013-12-24 6:37 ` [PATCH 6/9] trailer: parse trailers from input file Christian Couder
2013-12-24 6:37 ` [PATCH 7/9] trailer: put all the processing together and print Christian Couder
2013-12-24 6:37 ` [PATCH 8/9] trailer: add interpret-trailers command Christian Couder
2013-12-24 6:37 ` [PATCH 9/9] trailer: add tests for "git interpret-trailers" Christian Couder
2013-12-30 17:19 ` Junio C Hamano
2013-12-30 20:20 ` Josh Triplett
2013-12-30 20:46 ` Junio C Hamano
2013-12-30 20:52 ` Josh Triplett
2013-12-30 21:05 ` Junio C Hamano
2013-12-30 22:27 ` Josh Triplett
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=20131224063726.19560.28979.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=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).