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 v4 02/17] trailer: process trailers from file and arguments
Date: Thu, 30 Jan 2014 07:49:05 +0100 [thread overview]
Message-ID: <20140130064921.7504.60878.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20140130064217.7504.473.chriscool@tuxfamily.org>
This patch implements the logic that process trailers
from file and arguments.
At the beginning trailers from file are in their own
infile_tok doubly linked list, and trailers from
arguments are in their own arg_tok doubly linked list.
The lists are traversed and when an arg_tok should be
"applied", it is removed from its list and inserted
into the infile_tok list.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
trailer.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 189 insertions(+)
diff --git a/trailer.c b/trailer.c
index aed25e1..e9ccfa5 100644
--- a/trailer.c
+++ b/trailer.c
@@ -46,3 +46,192 @@ static size_t alnum_len(const char *buf, size_t len)
while (--len >= 0 && !isalnum(buf[len]));
return len + 1;
}
+
+static void add_arg_to_infile(struct trailer_item *infile_tok,
+ struct trailer_item *arg_tok)
+{
+ if (arg_tok->conf->where == WHERE_AFTER) {
+ arg_tok->next = infile_tok->next;
+ infile_tok->next = arg_tok;
+ arg_tok->previous = infile_tok;
+ if (arg_tok->next)
+ arg_tok->next->previous = arg_tok;
+ } else {
+ arg_tok->previous = infile_tok->previous;
+ infile_tok->previous = arg_tok;
+ arg_tok->next = infile_tok;
+ if (arg_tok->previous)
+ arg_tok->previous->next = arg_tok;
+ }
+}
+
+static int check_if_different(struct trailer_item *infile_tok,
+ struct trailer_item *arg_tok,
+ int alnum_len, int check_all)
+{
+ enum action_where where = arg_tok->conf->where;
+ do {
+ if (!infile_tok)
+ return 1;
+ if (same_trailer(infile_tok, arg_tok, alnum_len))
+ return 0;
+ /*
+ * if we want to add a trailer after another one,
+ * we have to check those before this one
+ */
+ infile_tok = (where == WHERE_AFTER) ? infile_tok->previous : infile_tok->next;
+ } while (check_all);
+ return 1;
+}
+
+static void apply_arg_if_exist(struct trailer_item *infile_tok,
+ struct trailer_item *arg_tok,
+ int alnum_len)
+{
+ switch (arg_tok->conf->if_exist) {
+ case EXIST_DO_NOTHING:
+ free(arg_tok);
+ break;
+ case EXIST_OVERWRITE:
+ free((char *)infile_tok->value);
+ infile_tok->value = xstrdup(arg_tok->value);
+ free(arg_tok);
+ break;
+ case EXIST_ADD:
+ add_arg_to_infile(infile_tok, arg_tok);
+ break;
+ case EXIST_ADD_IF_DIFFERENT:
+ if (check_if_different(infile_tok, arg_tok, alnum_len, 1))
+ add_arg_to_infile(infile_tok, arg_tok);
+ else
+ free(arg_tok);
+ break;
+ case EXIST_ADD_IF_DIFFERENT_NEIGHBOR:
+ if (check_if_different(infile_tok, arg_tok, alnum_len, 0))
+ add_arg_to_infile(infile_tok, arg_tok);
+ else
+ free(arg_tok);
+ break;
+ }
+}
+
+static void remove_from_list(struct trailer_item *item,
+ struct trailer_item **first)
+{
+ if (item->next)
+ item->next->previous = item->previous;
+ if (item->previous)
+ item->previous->next = item->next;
+ else
+ *first = item->next;
+}
+
+static struct trailer_item *remove_first(struct trailer_item **first)
+{
+ struct trailer_item *item = *first;
+ *first = item->next;
+ if (item->next) {
+ item->next->previous = NULL;
+ item->next = NULL;
+ }
+ return item;
+}
+
+static void process_infile_tok(struct trailer_item *infile_tok,
+ struct trailer_item **arg_tok_first,
+ enum action_where where)
+{
+ struct trailer_item *arg_tok;
+ struct trailer_item *next_arg;
+
+ int tok_alnum_len = alnum_len(infile_tok->token, strlen(infile_tok->token));
+ for (arg_tok = *arg_tok_first; arg_tok; arg_tok = next_arg) {
+ next_arg = arg_tok->next;
+ if (same_token(infile_tok, arg_tok, tok_alnum_len) &&
+ arg_tok->conf->where == where) {
+ /* Remove arg_tok from list */
+ remove_from_list(arg_tok, arg_tok_first);
+ /* Apply arg */
+ apply_arg_if_exist(infile_tok, arg_tok, tok_alnum_len);
+ /*
+ * If arg has been added to infile,
+ * then we need to process it too now.
+ */
+ if ((where == WHERE_AFTER ? infile_tok->next : infile_tok->previous) == arg_tok)
+ infile_tok = arg_tok;
+ }
+ }
+}
+
+static void update_last(struct trailer_item **last)
+{
+ if (*last)
+ while((*last)->next != NULL)
+ *last = (*last)->next;
+}
+
+static void update_first(struct trailer_item **first)
+{
+ if (*first)
+ while((*first)->previous != NULL)
+ *first = (*first)->previous;
+}
+
+static void apply_arg_if_missing(struct trailer_item **infile_tok_first,
+ struct trailer_item **infile_tok_last,
+ struct trailer_item *arg_tok)
+{
+ struct trailer_item **infile_tok;
+ enum action_where where;
+
+ switch (arg_tok->conf->if_missing) {
+ case MISSING_DO_NOTHING:
+ free(arg_tok);
+ break;
+ case MISSING_ADD:
+ where = arg_tok->conf->where;
+ infile_tok = (where == WHERE_AFTER) ? infile_tok_last : infile_tok_first;
+ if (*infile_tok) {
+ add_arg_to_infile(*infile_tok, arg_tok);
+ *infile_tok = arg_tok;
+ } else {
+ *infile_tok_first = arg_tok;
+ *infile_tok_last = arg_tok;
+ }
+ break;
+ }
+}
+
+static void process_trailers_lists(struct trailer_item **infile_tok_first,
+ struct trailer_item **infile_tok_last,
+ struct trailer_item **arg_tok_first)
+{
+ struct trailer_item *infile_tok;
+ struct trailer_item *arg_tok;
+
+ if (!*arg_tok_first)
+ return;
+
+ /* Process infile from end to start */
+ for (infile_tok = *infile_tok_last; infile_tok; infile_tok = infile_tok->previous) {
+ process_infile_tok(infile_tok, arg_tok_first, WHERE_AFTER);
+ }
+
+ update_last(infile_tok_last);
+
+ if (!*arg_tok_first)
+ return;
+
+ /* Process infile from start to end */
+ for (infile_tok = *infile_tok_first; infile_tok; infile_tok = infile_tok->next) {
+ process_infile_tok(infile_tok, arg_tok_first, WHERE_BEFORE);
+ }
+
+ update_first(infile_tok_first);
+
+ /* Process args left */
+ while (*arg_tok_first) {
+ arg_tok = remove_first(arg_tok_first);
+ apply_arg_if_missing(infile_tok_first, infile_tok_last, arg_tok);
+ }
+}
--
1.8.5.2.201.gacc5987
next prev parent reply other threads:[~2014-01-30 7:38 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-30 6:49 [PATCH v4 00/17] Add interpret-trailers builtin Christian Couder
2014-01-30 6:49 ` [PATCH v4 01/17] Add data structures and basic functions for commit trailers Christian Couder
2014-01-30 9:10 ` Eric Sunshine
2014-01-30 6:49 ` Christian Couder [this message]
2014-01-31 4:02 ` [PATCH v4 02/17] trailer: process trailers from file and arguments Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 03/17] trailer: read and process config information Christian Couder
2014-01-31 15:43 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 04/17] trailer: process command line trailer arguments Christian Couder
2014-01-31 16:30 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 05/17] strbuf: add strbuf_isspace() Christian Couder
2014-01-31 2:51 ` Eric Sunshine
2014-01-31 3:09 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 06/17] trailer: parse trailers from input file Christian Couder
2014-01-31 16:45 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 07/17] trailer: put all the processing together and print Christian Couder
2014-01-30 6:49 ` [PATCH v4 08/17] trailer: add interpret-trailers command Christian Couder
2014-01-31 16:10 ` Eric Sunshine
2014-02-06 20:12 ` Christian Couder
2014-01-30 6:49 ` [PATCH v4 09/17] trailer: add tests for "git interpret-trailers" Christian Couder
2014-01-30 6:49 ` [PATCH v4 10/17] trailer: if no input file is passed, read from stdin Christian Couder
2014-02-02 9:50 ` Eric Sunshine
2014-02-06 20:16 ` Christian Couder
2014-02-06 21:51 ` Junio C Hamano
2014-02-09 13:55 ` Christian Couder
2014-01-30 6:49 ` [PATCH v4 11/17] trailer: add new_trailer_item() function Christian Couder
2014-02-02 10:10 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 12/17] strbuf: add strbuf_replace() Christian Couder
2014-01-31 3:11 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 13/17] trailer: execute command from 'trailer.<name>.command' Christian Couder
2014-01-30 6:49 ` [PATCH v4 14/17] trailer: add tests for trailer command Christian Couder
2014-01-30 6:49 ` [PATCH v4 15/17] trailer: set author and committer env variables Christian Couder
2014-01-30 6:49 ` [PATCH v4 16/17] trailer: add tests for commands using " Christian Couder
2014-01-30 6:49 ` [PATCH v4 17/17] Documentation: add documentation for 'git interpret-trailers' Christian Couder
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=20140130064921.7504.60878.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).